aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/libfdk-aacdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-14 00:57:21 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-14 00:57:25 +0100
commit55f53f6c29acd459df64abf20cbd016c420b6cf6 (patch)
tree6d35adec5646a2c9a3c8bf9187d18299d1a3a098 /libavcodec/libfdk-aacdec.c
parentfdf4eb7911b37e49716b5a64004498ff308a8324 (diff)
parent6a8b35dc88b4a1a452f192fbbf53ae7f59bc3f23 (diff)
downloadffmpeg-55f53f6c29acd459df64abf20cbd016c420b6cf6.tar.gz
Merge commit '6a8b35dc88b4a1a452f192fbbf53ae7f59bc3f23'
* commit '6a8b35dc88b4a1a452f192fbbf53ae7f59bc3f23': dsputilenc_mmx: Merge two assignment blocks with identical conditions Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libfdk-aacdec.c')
0 files changed, 0 insertions, 0 deletions