[FFmpeg-cvslog] Merge commit '63d744e2be39466e3a734c2987cd713e0bac101e'
Michael Niedermayer
git at videolan.org
Thu Mar 14 12:39:27 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 14 12:30:19 2013 +0100| [fa92ee821bba1d3c2a497ed22e41927b552856f8] | committer: Michael Niedermayer
Merge commit '63d744e2be39466e3a734c2987cd713e0bac101e'
* commit '63d744e2be39466e3a734c2987cd713e0bac101e':
av_log_missing_feature() ---> avpriv_report_missing_feature()
Conflicts:
libavcodec/aacdec.c
libavcodec/tta.c
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa92ee821bba1d3c2a497ed22e41927b552856f8
---
More information about the ffmpeg-cvslog
mailing list