Merge commit 'f3b74d944bdef9bbe81f7690f8d837d843ec13a6'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Mar 2015 01:16:50 +0000 (02:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Mar 2015 01:17:01 +0000 (02:17 +0100)
* commit 'f3b74d944bdef9bbe81f7690f8d837d843ec13a6':
  pcxenc: Return more meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/pcxenc.c

Simple merge