[FFmpeg-cvslog] Merge commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577'
Michael Niedermayer
git at videolan.org
Fri Nov 1 18:47:57 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 1 18:36:03 2013 +0100| [66df6f5407543cf791302bf3bc6958758bdae0eb] | committer: Michael Niedermayer
Merge commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577'
* commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577':
lavc: deprecate AVCodecContext.debug_mv
Conflicts:
libavcodec/options_table.h
Not merged, debug_mv works fine
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=66df6f5407543cf791302bf3bc6958758bdae0eb
---
More information about the ffmpeg-cvslog
mailing list