aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/atrac1data.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-06 15:43:34 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-06 15:55:47 +0100
commit54a71f2e6c9d8ff42ac0367d54b9df39a31cb3ff (patch)
treed25dd9b537de12e72a9486cb5b425de8022d2862 /libavcodec/atrac1data.h
parent1bb547192f6e9bd28b55f1f11d43bcc216976ac7 (diff)
parentb519298a1578e0c895d53d4b4ed8867b1c031a56 (diff)
downloadffmpeg-54a71f2e6c9d8ff42ac0367d54b9df39a31cb3ff.tar.gz
Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'
* commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56': pixdesc: fix yuva 10bit bit depth avconv: deprecate the -vol option x86: af_volume: add SSE2/SSSE3/AVX-optimized s32 volume scaling x86: af_volume: add SSE2-optimized s16 volume scaling Conflicts: ffmpeg.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/atrac1data.h')
0 files changed, 0 insertions, 0 deletions