oMerge commit '85ac12587bfef970d0e0e4abc292df346daf8478'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Sep 2013 09:40:45 +0000 (11:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Sep 2013 09:40:45 +0000 (11:40 +0200)
commit58e5f6a4332077eb7e1cfd8a6a3d0bc59759386d
treed6d4d0ec7615b0cf840e970a28fe97ae51f9238d
parente3d34100e73c256e250534d64eb5f07daf3d0fef
parent85ac12587bfef970d0e0e4abc292df346daf8478
oMerge commit '85ac12587bfef970d0e0e4abc292df346daf8478'

* commit '85ac12587bfef970d0e0e4abc292df346daf8478':
  nuv: check ff_rtjpeg_decode_frame_yuv420 return value

Conflicts:
libavcodec/nuv.c

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