diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-08 05:47:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-08 05:47:27 +0100 |
| commit | 4f79c7dd0853a10a28f603bceaba0b192540f67a (patch) | |
| tree | 772bea3fe84ddc3429c0e171d63fd785ea0f3af5 /libavcodec/avcodec.h | |
| parent | 0cc9949eadc8378000f7c165e3809411651357dc (diff) | |
| parent | 7bd8b70f19642b6ea53e0d36f53fe88edfe0d450 (diff) | |
| download | ffmpeg-4f79c7dd0853a10a28f603bceaba0b192540f67a.tar.gz | |
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>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index e937c9459b..98c9021a6b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -209,6 +209,7 @@ enum CodecID { CODEC_ID_8SVX_FIB, #endif CODEC_ID_ESCAPE124, + CODEC_ID_ESCAPE130, CODEC_ID_DIRAC, CODEC_ID_BFI, CODEC_ID_CMV, |