Mercurial > libavcodec.hg
changeset 1911:5b379ba0a577 libavcodec
hmm av_log(..., get_bits());
| author | michael |
|---|---|
| date | Sun, 28 Mar 2004 23:10:53 +0000 |
| parents | 5c21b165abf6 |
| children | 351e996f29d9 |
| files | mjpeg.c |
| diffstat | 1 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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"))