]> git.sesse.net Git - ffmpeg/commit
Merge commit 'ff07ec143ebd3833fd5a3f4b6c00474ac523a31f'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Sep 2013 23:54:59 +0000 (01:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Sep 2013 23:54:59 +0000 (01:54 +0200)
commitbbe50a8001ade24618685f6cacefc5d49a2e003c
tree24a211e402ad41f04a959049000229d6333f1284
parentc955bac7d5c1984dcb06539fe61844b7c09b72b4
parentff07ec143ebd3833fd5a3f4b6c00474ac523a31f
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>
libavcodec/pcx.c