[FFmpeg-cvslog] Merge commit '74a9a624c5c4d50760d8d57458eba57366f6cb26'

Michael Niedermayer git at videolan.org
Mon Jan 14 15:32:19 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 14 15:17:16 2013 +0100| [4adc8a29a0565cb35815eeb8e693b47dcaf890ce] | committer: Michael Niedermayer

Merge commit '74a9a624c5c4d50760d8d57458eba57366f6cb26'

* commit '74a9a624c5c4d50760d8d57458eba57366f6cb26':
  vcr1: return a meaningful error code.
  rpza: return a meaningful error code.
  qdrw: cosmetics, reformat

Conflicts:
	libavcodec/qdrw.c

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

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





More information about the ffmpeg-cvslog mailing list