Changeset 3ead79ea in ffmpeg

Timestamp:

Apr 25, 2012, 9:17:41 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

23282c22

Parents:

cab15f9 (diff), 394dbde5 (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> (04/25/12 20:01:59)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/25/12 21:17:41)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: FATE: use updated reference for aac-latm_stereo_to_51 avconv: use libavresample Add libavresample FATE: avoid channel mixing in lavf-dv_fmt

Conflicts:

Changelog
Makefile
cmdutils.c
configure
doc/APIchanges
ffmpeg.c
tests/lavf-regression.sh
tests/ref/lavf/dv_fmt
tests/ref/seek/lavf_dv

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

(No files)