Files
ffmpeg/libavcodec/nuv.c
Michael Niedermayer 58e5f6a433 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>
2013-09-08 11:40:45 +02:00

11 KiB