Changeset 2b7c0c9f in ffmpeg

Timestamp:

Mar 30, 2012, 4:05:39 AM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ec0965be

Parents:

d3d5e84f (diff), a05c41ac (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (03/30/12 04:03:30)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/30/12 04:05:39)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: mp3dec: perform I/S and M/S only when frame mode is joint stereo. id3v2: add another mimetype for JPEG image lzw: prevent buffer overreads. WMAL: Remove inaccurate and unnecessary doxy h264: fix cabac-on-stack after safe cabac reader. truemotion2: convert packet header reading to bytestream2.

Conflicts:

libavcodec/lzw.c
libavcodec/truemotion2.c
libavformat/id3v2.c

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

(No files)