diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-02-03 00:34:10 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-02-03 00:34:10 +0000 |
| commit | 15ed98032861393d23adf4076c704a0d85361895 (patch) | |
| tree | 35dbeaa23b18ceb9f2effb43b80a06b940eea91e | |
| parent | 4eed5fa989c8547195f7035fd59a1430b8962c5a (diff) | |
| download | xine-lib-15ed98032861393d23adf4076c704a0d85361895.tar.gz xine-lib-15ed98032861393d23adf4076c704a0d85361895.tar.bz2 | |
The AVI demuxer already has the video type when checking for XVid. Optimise.
| -rw-r--r-- | src/demuxers/demux_avi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index c6a73ebde..239517777 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -1899,8 +1899,8 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) { * however, at least for this case (compressor: xvid biCompression: DIVX), the * xvid fourcc must prevail as it is used by ffmpeg to detect encoder bugs. [MF] */ - if( _x_fourcc_to_buf_video(this->avi->compressor) == BUF_VIDEO_XVID && - _x_fourcc_to_buf_video(this->avi->bih->biCompression) == BUF_VIDEO_MPEG4 ) { + if( this->avi->video_type == BUF_VIDEO_MPEG4 && + _x_fourcc_to_buf_video(this->avi->compressor) == BUF_VIDEO_XVID ) { this->avi->bih->biCompression = this->avi->compressor; this->avi->video_type = BUF_VIDEO_XVID; } |