Changeset 4a4c4278 in ffmpeg

Timestamp:

Jan 16, 2012, 12:33:35 AM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0c10885c

Parents:

f94ce3bc (diff), 2df5f59a (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> (01/16/12 00:20:32)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/16/12 00:33:35)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: fate: split ADPCM and DPCM test references into separate files. mov, mxfdec: Employ more meaningful return values. lavc: Relax API strictness in avcodec_decode_audio3 with a custom get_buffer() wavpack: fix clipping for 32-bit lossy mode vb: Use bytestream2 functions

Conflicts:

libavcodec/utils.c
libavcodec/vb.c
libavformat/mxfdec.c
tests/fate/dpcm.mak

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

(No files)