[FFmpeg-cvslog] oMerge commit '85ac12587bfef970d0e0e4abc292df346daf8478'

Michael Niedermayer git at videolan.org
Sun Sep 8 11:46:35 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Sep  8 11:40:45 2013 +0200| [58e5f6a4332077eb7e1cfd8a6a3d0bc59759386d] | committer: Michael Niedermayer

oMerge commit '85ac12587bfef970d0e0e4abc292df346daf8478'

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

Conflicts:
	libavcodec/nuv.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58e5f6a4332077eb7e1cfd8a6a3d0bc59759386d
---





More information about the ffmpeg-cvslog mailing list