aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/fft-fixed-test.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-15 02:34:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-15 03:10:05 +0200
commit9260710739862db94aa1f66a827115a1d89c5361 (patch)
tree7dc8058c72371823f694a5ca89a9871caf5f9d01 /libavcodec/fft-fixed-test.c
parentb0558cd01110a8f579f4871ae0995a03064b1c2e (diff)
parent944c47166d618dc02b65fd644b7a34de516514c8 (diff)
downloadffmpeg-9260710739862db94aa1f66a827115a1d89c5361.tar.gz
Merge remote-tracking branch 'jamrial/release/1.1' into release/1.1
* jamrial/release/1.1: oggparseskeleton: avoid header parsing failure oggparseskeleton: Replace avpriv_report_missing_feature() with a normal av_log() call oggparseskeleton: Fix fisbone header parsing Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/fft-fixed-test.c')
0 files changed, 0 insertions, 0 deletions