diff options
| author | Torsten Jager <t.jager@gmx.de> | 2011-08-13 18:02:30 +0200 |
|---|---|---|
| committer | Torsten Jager <t.jager@gmx.de> | 2011-08-13 18:02:30 +0200 |
| commit | e96bac07aae3a9677661fd581b7c7e4e98964831 (patch) | |
| tree | b991e0e0dabc686ad7c76f21d1f374a55011d221 /src | |
| parent | 41500b69fd2f67541904bb7b146d5ba3ee472d21 (diff) | |
| download | xine-lib-e96bac07aae3a9677661fd581b7c7e4e98964831.tar.gz xine-lib-e96bac07aae3a9677661fd581b7c7e4e98964831.tar.bz2 | |
rv30 & rv40 support
Diffstat (limited to 'src')
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 6 | ||||
| -rw-r--r-- | src/combined/ffmpeg/xine_video.list | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index ad0ee6022..a9c383c48 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -329,6 +329,10 @@ static void init_video_codec (ff_video_decoder_t *this, unsigned int codec_type) this->context->flags |= CODEC_FLAG_EMU_EDGE; } + /* TJ. without this, it wont work at all on my machine */ + this->context->codec_id = this->codec->id; + this->context->codec_type = this->codec->type; + if (this->class->choose_speed_over_accuracy) this->context->flags2 |= CODEC_FLAG2_FAST; @@ -910,6 +914,8 @@ static void ff_handle_header_buffer (ff_video_decoder_t *this, buf_element_t *bu switch (codec_type) { case BUF_VIDEO_RV10: case BUF_VIDEO_RV20: + case BUF_VIDEO_RV30: + case BUF_VIDEO_RV40: this->bih.biWidth = _X_BE_16(&this->buf[12]); this->bih.biHeight = _X_BE_16(&this->buf[14]); diff --git a/src/combined/ffmpeg/xine_video.list b/src/combined/ffmpeg/xine_video.list index 546cfff7c..bd1238d6f 100644 --- a/src/combined/ffmpeg/xine_video.list +++ b/src/combined/ffmpeg/xine_video.list @@ -24,6 +24,8 @@ I263 H263I ITU H.263 H263 H263 H.263 RV10 RV10 Real Video 1.0 RV20 RV20 Real Video 2.0 +RV30 RV30 Real Video 3.0 +RV40 RV40 Real Video 4.0 IV31 INDEO3 Indeo Video 3.1 IV32 INDEO3 Indeo Video 3.2 SORENSON_V1 SVQ1 Sorenson Video 1 |