diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-07 21:28:24 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-07 21:38:54 +0200 |
commit | 5b9917ec2b1372015390ee4fe82b56a55f463d55 (patch) | |
tree | 4930413ba2c57887819bf1a0f9c3f6310f757961 /libavcodec/arm/hpeldsp_armv6.S | |
parent | 467e7a8f26e54c300ba494bf00033fec1078fa45 (diff) | |
parent | 7ce011e054d1a5c3ae18149b96ef87b05175c55e (diff) | |
download | ffmpeg-5b9917ec2b1372015390ee4fe82b56a55f463d55.tar.gz |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Do not offer smvjpeg lowres capabilities, the decoder does not support it.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/hpeldsp_armv6.S')
0 files changed, 0 insertions, 0 deletions