Changeset 0e6aa0fe in ffmpeg

Timestamp:

Feb 28, 2012, 11:30:35 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

51defefa

Parents:

f929abd0 (diff), bbeb291 (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: adpcm: Clip step_index values read from the bitstream at the beginning of each frame. oma: don't read beyond end of leaf_table. doxygen: Remove documentation for non-existing parameters; misc small fixes. Indeo3: fix crashes on corrupt bitstreams. msmpeg4: Replace forward declaration by proper #include. segment: implement wrap around avf: reorder AVStream and AVFormatContext aacdec: Remove erroneous reference to global gain from the out of bounds scalefactor error message.

Conflicts:

libavcodec/indeo3.c
libavformat/avformat.h
libavutil/avutil.h

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)