Merge remote-tracking branch 'richardpl/escape130'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Dec 2011 04:47:00 +0000 (05:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Dec 2011 04:47:27 +0000 (05:47 +0100)
* richardpl/escape130:
  escape130: fix colors
  escape130: remove trailing whitespace
  rpl: enable escape130 codec
  escape130: minimal effort to make it compile without warnings
  Escape 130 (RPL) decoder

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

Simple merge
Simple merge