aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/adpcm.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-13 23:17:54 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-13 23:23:01 +0100
commite1f37c48e54f98d34f8a032e1d96f7a135a8545d (patch)
tree74c11781b08a32228c081d6e679d778b6ac686a5 /libavcodec/adpcm.c
parentfa4bb7c5b249da60cd16113b795a64f0055ef164 (diff)
parent247e370e2a913db52ca079b347a174c8d393b171 (diff)
downloadffmpeg-e1f37c48e54f98d34f8a032e1d96f7a135a8545d.tar.gz
Merge commit '247e370e2a913db52ca079b347a174c8d393b171'
* commit '247e370e2a913db52ca079b347a174c8d393b171': TDSC decoder Conflicts: Changelog doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/version.h tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcm.c')
0 files changed, 0 insertions, 0 deletions