diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-07-02 14:56:38 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-07-02 14:56:38 +0200 |
| commit | 2cc35d940bc56a31f7f3b0d36a397d7368959da7 (patch) | |
| tree | 3818b17c518a8fabb64dbb8492676084f1b6b48d /src/libffmpeg | |
| parent | 134b0fb375db5eb99f9b7a13ef623709603721fa (diff) | |
| parent | 98b085ddc29581003d76acb79ca4484fcf25b555 (diff) | |
| download | xine-lib-2cc35d940bc56a31f7f3b0d36a397d7368959da7.tar.gz xine-lib-2cc35d940bc56a31f7f3b0d36a397d7368959da7.tar.bz2 | |
Merge with 1.1.
Diffstat (limited to 'src/libffmpeg')
| -rw-r--r-- | src/libffmpeg/ff_video_decoder.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libffmpeg/ff_video_decoder.c b/src/libffmpeg/ff_video_decoder.c index fd7d6a795..39e8ad4ac 100644 --- a/src/libffmpeg/ff_video_decoder.c +++ b/src/libffmpeg/ff_video_decoder.c @@ -309,6 +309,7 @@ static const ff_codec_t ff_video_lookup[] = { {BUF_VIDEO_KMVC, CODEC_ID_KMVC, "Karl Morton's Video Codec (ffmpeg)"}, {BUF_VIDEO_FLASHSV, CODEC_ID_FLASHSV, "Flash Screen Video (ffmpeg)"}, {BUF_VIDEO_CAVS, CODEC_ID_CAVS, "Chinese AVS (ffmpeg)"}, + {BUF_VIDEO_THEORA_RAW, CODEC_ID_THEORA, "Theora (ffmpeg)"}, }; @@ -1745,7 +1746,7 @@ static uint32_t supported_video_types[] = { #if defined(HAVE_FFMPEG) || CONFIG_CAVS_DECODER BUF_VIDEO_CAVS, #endif - + BUF_VIDEO_THEORA_RAW, 0 }; |