diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2012-05-10 15:45:58 +0300 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2012-05-10 15:45:58 +0300 |
| commit | 9bcfbe2472083802462fee1fea684d92bba5627b (patch) | |
| tree | bd61379a8b76621e5c1f901d829b16971b3da996 /src | |
| parent | c8cc5ea5c2709950fa3aff21d34d52f3257fa3c6 (diff) | |
| parent | 1ac90ffd4e9f4c26ac8b4027dcfd91a8bf92c2ec (diff) | |
| download | xine-lib-9bcfbe2472083802462fee1fea684d92bba5627b.tar.gz xine-lib-9bcfbe2472083802462fee1fea684d92bba5627b.tar.bz2 | |
Merge from 1.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index f995b965f..0291e3f4b 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -1599,8 +1599,8 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) { img->duration = video_step_to_use; /* additionally crop away the extra pixels due to adjusting frame size above */ - img->crop_right = this->crop_right + (img->width - this->bih.biWidth); - img->crop_bottom = this->crop_bottom + (img->height - this->bih.biHeight); + img->crop_right = img->width - this->bih.biWidth; + img->crop_bottom = img->height - this->bih.biHeight; /* transfer some more frame settings for deinterlacing */ img->progressive_frame = !this->av_frame->interlaced_frame; @@ -1631,8 +1631,8 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) { img->duration = video_step_to_use; /* additionally crop away the extra pixels due to adjusting frame size above */ - img->crop_right = ((this->bih.biWidth <= 0) ? 0 : this->crop_right) + (img->width - this->bih.biWidth); - img->crop_bottom = ((this->bih.biHeight <= 0) ? 0 : this->crop_bottom) + (img->height - this->bih.biHeight); + img->crop_right = this->bih.biWidth <= 0 ? 0 : (img->width - this->bih.biWidth); + img->crop_bottom = this->bih.biHeight <= 0 ? 0 : (img->height - this->bih.biHeight); img->bad_frame = 1; this->skipframes = img->draw(img, this->stream); |