aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/arm/dsputil_arm.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-06 12:34:09 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-06 12:34:09 +0200
commit61845dc74afce9c33583eb1d0ed82c115ff61d4b (patch)
tree10df818d391286c9cfb44a87a6c65c5f3662d833 /libavcodec/arm/dsputil_arm.h
parent5866c107a9b9d936f3b5c2385a5f724c900df01d (diff)
parent66f091053f11a8957b2175480d2f368d2cf4474c (diff)
downloadffmpeg-61845dc74afce9c33583eb1d0ed82c115ff61d4b.tar.gz
Merge commit '66f091053f11a8957b2175480d2f368d2cf4474c'
* commit '66f091053f11a8957b2175480d2f368d2cf4474c': mpeg12enc: drop forward declarations Conflicts: libavcodec/mpeg12enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/dsputil_arm.h')
0 files changed, 0 insertions, 0 deletions