diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-26 00:01:59 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-26 01:17:41 +0400 |
| commit | 3ead79eaa3f77451bc93cb842ed7b38c94858045 (patch) | |
| tree | 4c90cceb47c62f96eaa518cd9ad109b539e9f1ad /ffplay.c | |
| parent | cab15f9db4ba6e390b25dd80d7305bb51b5583c4 (diff) | |
| parent | 394dbde5484507f213768019623d016196ddad5f (diff) | |
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>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions