[FFmpeg-cvslog] Merge remote-tracking branch 'richardpl/escape130'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec  8 05:47:00 2011 +0100| [4f79c7dd0853a10a28f603bceaba0b192540f67a] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4f79c7dd0853a10a28f603bceaba0b192540f67a
---