[FFmpeg-cvslog] Merge commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b'
Michael Niedermayer
git at videolan.org
Sat Mar 16 16:44:03 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 16 16:38:11 2013 +0100| [7fff5781b6a94fa6f29a1e508f5badbbecf35232] | committer: Michael Niedermayer
Merge commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b'
* commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b':
vf_showinfo: remove its useless init function
AVOptions: fix using named constants with child contexts.
Conflicts:
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7fff5781b6a94fa6f29a1e508f5badbbecf35232
---
More information about the ffmpeg-cvslog
mailing list