[FFmpeg-cvslog] Merge commit 'd9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc'
Michael Niedermayer
git at videolan.org
Sat Feb 16 14:34:23 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 16 14:30:21 2013 +0100| [8b7568cc3482e9ee066855c91ca8445dde710cd3] | committer: Michael Niedermayer
Merge commit 'd9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc'
* commit 'd9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc':
svq3: remove a pointless if()
h264: remove a pointless if()
Conflicts:
libavcodec/h264.c
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b7568cc3482e9ee066855c91ca8445dde710cd3
---
More information about the ffmpeg-cvslog
mailing list