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)
commit4f79c7dd0853a10a28f603bceaba0b192540f67a
tree772bea3fe84ddc3429c0e171d63fd785ea0f3af5
parent0cc9949eadc8378000f7c165e3809411651357dc
parent7bd8b70f19642b6ea53e0d36f53fe88edfe0d450
Merge remote-tracking branch 'richardpl/escape130'

* 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>
libavcodec/allcodecs.c
libavcodec/avcodec.h