aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample/resample.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-19 12:55:26 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-19 12:55:26 +0200
commit32ea39f56d90585c63eedfcb631e0a939fc1f95e (patch)
treefc23e9cf250c9b2b9b05f617d1513d5386b4de78 /libswresample/resample.c
parent257f11820bdf628648466ce07ee0bf67217b543e (diff)
parent1914e6f010b3320025c7b692aaea51d9b9a992a8 (diff)
downloadffmpeg-32ea39f56d90585c63eedfcb631e0a939fc1f95e.tar.gz
Merge commit '1914e6f010b3320025c7b692aaea51d9b9a992a8'
* commit '1914e6f010b3320025c7b692aaea51d9b9a992a8': aacdec: Add support for LD (Low Delay) AAC Conflicts: Changelog libavcodec/aacdec.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/resample.c')
0 files changed, 0 insertions, 0 deletions