diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-05 21:47:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-05 21:47:21 +0200 |
| commit | 3e32bf3dbddc1882775ea69e779a5906c3bb5701 (patch) | |
| tree | 277ea2a28de3c5ca8218718fab8fe6a4a39c7187 /libavcodec/arm/aac.h | |
| parent | 6e19cfb083eda83aaf4b49ae765ab2b3e578d32d (diff) | |
| parent | 6a92551234c6966ab59d00052076b79133e6e7e5 (diff) | |
| download | ffmpeg-3e32bf3dbddc1882775ea69e779a5906c3bb5701.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lsws: remove optimization debug logs in sws_init_context()
lsws: use array for storing the supported in/out information
Conflicts:
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/aac.h')
0 files changed, 0 insertions, 0 deletions