aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/amrwbdata.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-28 23:56:45 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-28 23:58:29 +0100
commit5c17377e28e818d3074a608d42821d66f1d26e8d (patch)
tree20d4cdffb7b87b8122e0e0a9ceb6b2089d75da53 /libavcodec/amrwbdata.h
parente82b0e612607d652c1519ee31d30272113775679 (diff)
parentd74a8cb7e42f703be5796eeb485f06af710ae8ca (diff)
downloadffmpeg-5c17377e28e818d3074a608d42821d66f1d26e8d.tar.gz
Merge commit 'd74a8cb7e42f703be5796eeb485f06af710ae8ca'
* commit 'd74a8cb7e42f703be5796eeb485f06af710ae8ca': fmtconvert: drop unused functions Conflicts: libavcodec/arm/fmtconvert_vfp_armv6.S libavcodec/x86/fmtconvert.asm libavcodec/x86/fmtconvert_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/amrwbdata.h')
0 files changed, 0 insertions, 0 deletions