Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Jun 2013 19:28:24 +0000 (21:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Jun 2013 19:38:54 +0000 (21:38 +0200)
* cehoyos/master:
  Do not offer smvjpeg lowres capabilities, the decoder does not support it.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/smvjpegdec.c

Simple merge