diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-10 02:13:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-10 02:16:33 +0100 |
| commit | 529d3e002642a9901ae463dea0263768dc843173 (patch) | |
| tree | e022885e2b9c1cee95c30aa2ed53a2ab56831f01 /libavcodec/v210x.c | |
| parent | a93369845783a5a63e713c143cab2c550a6ccd82 (diff) | |
| parent | 2dd95bd7cfd1acbbac8844739572667f40314b79 (diff) | |
| download | ffmpeg-529d3e002642a9901ae463dea0263768dc843173.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: remove unused macro WRAPPER8_16
configure: fix automatic processing of _extralibs in check_deps
libvpxenc: Support forcing keyframes
ac3dec: decode directly into output buffers
Conflicts:
libavcodec/ac3dec.c
libavcodec/libvpxenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/v210x.c')
0 files changed, 0 insertions, 0 deletions