aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-07 21:28:24 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-06-07 21:38:54 +0200
commit5b9917ec2b1372015390ee4fe82b56a55f463d55 (patch)
tree4930413ba2c57887819bf1a0f9c3f6310f757961 /ffmpeg.c
parent467e7a8f26e54c300ba494bf00033fec1078fa45 (diff)
parent7ce011e054d1a5c3ae18149b96ef87b05175c55e (diff)
downloadffmpeg-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 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions