aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/amrwbdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-05 19:16:39 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-05 19:16:39 +0200
commitebb21887b853ffd2ae6eedddef39e13c91bc7956 (patch)
tree95a94b931393cb99f27ecffddf14cd1012b0926f /libavcodec/amrwbdec.c
parent865c94bb57dbb44b0855bba66cd4a11b28cc6ba2 (diff)
parent01c5779f56cf708e6cb88b11cfdc248cae7e2ee8 (diff)
downloadffmpeg-ebb21887b853ffd2ae6eedddef39e13c91bc7956.tar.gz
Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'
* commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8': x86: Drop some unnecessary YASM ifdefs Conflicts: libavfilter/x86/vf_yadif_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/amrwbdec.c')
0 files changed, 0 insertions, 0 deletions