Changeset 4dcd1a31 in ffmpeg

Timestamp:

Nov 28, 2011, 11:20:29 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

fc09bf57

Parents:

4b03d960 (diff), ac47e014 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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@gmx.at>

(No files)