[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Tue Nov 29 00:37:14 CET 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 29 00:20:29 2011 +0100| [4dcd1a3145dd93602b86a44ebc07d98ca2a30ab6] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
adtsenc: Check frame size.
txd: Fix order of operations.
APIchanges: fill in some blanks
timer: fix misspelling of "decicycles"
Eliminate pointless 0/NULL initializers in AVCodec and similar declarations.
indeo3: cosmetics
md5proto: Fix order of operations.
dca: Replace oversized unused get_bits() with skip_bits_long().
Conflicts:
doc/APIchanges
libavformat/mmsh.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4dcd1a3145dd93602b86a44ebc07d98ca2a30ab6
---
More information about the ffmpeg-cvslog
mailing list