breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
2ece7d94bc35ba0ee2b650caec25853b9fcc2eb7
FFmpeg/libavcodec/pcx.c
Michael Niedermayer bbe50a8001 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@gmx.at>
2013-09-30 01:54:59 +02:00

7.9 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink