aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/aacdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-24 21:16:08 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-24 21:17:11 +0200
commit861dec5e90254818636a20188f2844222962bfdf (patch)
treed57ed3c92f784532f364c3db60d76ca09a9425e7 /libavcodec/aacdec.c
parent9c56cf09ca6da8b89c3155dc50f75232571d0be7 (diff)
parentb17cbb0b1c4fdf8324eff24d40a02201bfaebfd3 (diff)
downloadffmpeg-861dec5e90254818636a20188f2844222962bfdf.tar.gz
Merge commit 'b17cbb0b1c4fdf8324eff24d40a02201bfaebfd3'
* commit 'b17cbb0b1c4fdf8324eff24d40a02201bfaebfd3': riff: Add GMP4 fourcc for mpeg4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacdec.c')
0 files changed, 0 insertions, 0 deletions