summaryrefslogtreecommitdiff
path: root/src/libffmpeg
diff options
context:
space:
mode:
authorMatt Messier <mmessier@grapetv.org>2007-05-08 15:10:27 -0400
committerMatt Messier <mmessier@grapetv.org>2007-05-08 15:10:27 -0400
commitc8f3f69be6bd2a6ce361e2433f174abd57b77911 (patch)
treea8db2fb70963d1e4e2a4c8291a9a5548540ca7eb /src/libffmpeg
parent1956c347edc0af71e479eacbc9e64f67ba7cba05 (diff)
parent92d72104e3cd37e7470a41a65b230297592f1331 (diff)
downloadxine-lib-c8f3f69be6bd2a6ce361e2433f174abd57b77911.tar.gz
xine-lib-c8f3f69be6bd2a6ce361e2433f174abd57b77911.tar.bz2
Merge changes from main 1.2 repository
Diffstat (limited to 'src/libffmpeg')
-rw-r--r--src/libffmpeg/ff_video_decoder.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libffmpeg/ff_video_decoder.c b/src/libffmpeg/ff_video_decoder.c
index c6506c0e5..d7d162387 100644
--- a/src/libffmpeg/ff_video_decoder.c
+++ b/src/libffmpeg/ff_video_decoder.c
@@ -1184,6 +1184,11 @@ static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) {
if ((this->aspect_ratio_prio < 2) &&
av_cmp_q(this->context->sample_aspect_ratio, avr00)) {
+ if (!this->bih.biWidth || !this->bih.biHeight) {
+ this->bih.biWidth = this->context->width;
+ this->bih.biHeight = this->context->height;
+ }
+
this->aspect_ratio = av_q2d(this->context->sample_aspect_ratio) *
(double)this->bih.biWidth / (double)this->bih.biHeight;
this->aspect_ratio_prio = 2;