[FFmpeg-cvslog] Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
Michael Niedermayer
git at videolan.org
Thu Mar 14 12:45:55 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 14 12:41:34 2013 +0100| [a9ddb624890dd8c334617239793e63d93fbd52ee] | committer: Michael Niedermayer
Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
* commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e':
avformat: av_log_ask_for_sample() ---> avpriv_request_sample()
Conflicts:
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a9ddb624890dd8c334617239793e63d93fbd52ee
---
More information about the ffmpeg-cvslog
mailing list