# HG changeset patch
# User michael
# Date 1080515453 0
# Node ID 5b379ba0a577d9f222f9f8d61833dd1023e8a0e6
# Parent  5c21b165abf6cc25757878190e32c1ab9a76f3da
hmm av_log(..., get_bits());

diff -r 5c21b165abf6 -r 5b379ba0a577 mjpeg.c
--- a/mjpeg.c	Fri Mar 26 21:58:55 2004 +0000
+++ b/mjpeg.c	Sun Mar 28 23:10:53 2004 +0000
@@ -1530,16 +1530,22 @@
     
     if (id == ff_get_fourcc("JFIF"))
     {
-	int t_w, t_h;
+	int t_w, t_h, v1, v2;
 	skip_bits(&s->gb, 8); /* the trailing zero-byte */
-        if (s->avctx->debug & FF_DEBUG_PICT_INFO)
-            av_log(s->avctx, AV_LOG_INFO, "mjpeg: JFIF header found (version: %x.%x)\n",
-	    get_bits(&s->gb, 8), get_bits(&s->gb, 8));
+	v1= get_bits(&s->gb, 8);
+        v2= get_bits(&s->gb, 8);
         skip_bits(&s->gb, 8);
 
         s->avctx->sample_aspect_ratio.num= get_bits(&s->gb, 16);
         s->avctx->sample_aspect_ratio.den= get_bits(&s->gb, 16);
 
+        if (s->avctx->debug & FF_DEBUG_PICT_INFO)
+            av_log(s->avctx, AV_LOG_INFO, "mjpeg: JFIF header found (version: %x.%x) SAR=%d/%d\n",
+                v1, v2,
+                s->avctx->sample_aspect_ratio.num,
+                s->avctx->sample_aspect_ratio.den
+            );
+
 	t_w = get_bits(&s->gb, 8);
 	t_h = get_bits(&s->gb, 8);
 	if (t_w && t_h)
@@ -1636,7 +1642,8 @@
 	    else
 		cbuf[i] = 0;
 
-	    av_log(s->avctx, AV_LOG_INFO, "mjpeg comment: '%s'\n", cbuf);
+            if(s->avctx->debug & FF_DEBUG_PICT_INFO)
+                av_log(s->avctx, AV_LOG_INFO, "mjpeg comment: '%s'\n", cbuf);
 
 	    /* buggy avid, it puts EOI only at every 10th frame */
 	    if (!strcmp(cbuf, "AVID"))