summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/libffmpeg/xine_decoder.c5
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f2762089..e73810499 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
xine-lib (1-beta6)
* inform the width and height for the v4l input plugin
-
+ * ffmpeg aspect ratio detection code fixed
+
xine-lib (1-beta5)
* new AV sync strategy (audio resample) for DXR3 users
* improved fb driver with zero copy
diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c
index 3e43f3452..2a89567be 100644
--- a/src/libffmpeg/xine_decoder.c
+++ b/src/libffmpeg/xine_decoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine_decoder.c,v 1.95 2003/02/20 02:13:19 jstembridge Exp $
+ * $Id: xine_decoder.c,v 1.96 2003/02/22 17:32:31 guenter Exp $
*
* xine decoder plugin using ffmpeg
*
@@ -503,7 +503,8 @@ static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
float diff;
this->xine_aspect_ratio = XINE_VO_ASPECT_DONT_TOUCH;
- diff = abs_float( this->context->aspect_ratio - 0.0 );
+ diff = abs_float( this->context->aspect_ratio -
+ (float)this->bih.biWidth/(float)this->bih.biHeight);
if( diff > abs_float( this->context->aspect_ratio - 1.0 ) ) {
this->xine_aspect_ratio = XINE_VO_ASPECT_SQUARE;