[FFmpeg-cvslog] Merge commit 'ff07ec143ebd3833fd5a3f4b6c00474ac523a31f'

Michael Niedermayer git at videolan.org
Mon Sep 30 01:59:09 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 30 01:54:59 2013 +0200| [bbe50a8001ade24618685f6cacefc5d49a2e003c] | committer: Michael Niedermayer

Merge commit 'ff07ec143ebd3833fd5a3f4b6c00474ac523a31f'

* commit 'ff07ec143ebd3833fd5a3f4b6c00474ac523a31f':
  pcx: Return an error on broken palette if err_detect is set to 'explode'

Conflicts:
	libavcodec/pcx.c

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

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





More information about the ffmpeg-cvslog mailing list