aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample/arm
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-07 13:48:56 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-07 13:49:04 +0100
commit7f23b2a9d0da328e6939de87a0ef509842b3a907 (patch)
tree1af3172fb0bc945b690e5ea2623672b19a1b51e8 /libswresample/arm
parentd5518545d1b6df40d71e43dab8ada97710273db3 (diff)
parentc5fcdb440237f06f6c954185ab60970cabf786a2 (diff)
downloadffmpeg-7f23b2a9d0da328e6939de87a0ef509842b3a907.tar.gz
Merge commit 'c5fcdb440237f06f6c954185ab60970cabf786a2'
* commit 'c5fcdb440237f06f6c954185ab60970cabf786a2': error_resilience: remove a useless if() and FIXME h264: remove silly macros Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/arm')
0 files changed, 0 insertions, 0 deletions