mirror of https://git.ffmpeg.org/ffmpeg.git
hmm av_log(..., get_bits());
Originally committed as revision 2939 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
906b578f16
commit
96d8b5a62c
|
@ -1530,16 +1530,22 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
|
||||||
|
|
||||||
if (id == ff_get_fourcc("JFIF"))
|
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 */
|
skip_bits(&s->gb, 8); /* the trailing zero-byte */
|
||||||
if (s->avctx->debug & FF_DEBUG_PICT_INFO)
|
v1= get_bits(&s->gb, 8);
|
||||||
av_log(s->avctx, AV_LOG_INFO, "mjpeg: JFIF header found (version: %x.%x)\n",
|
v2= get_bits(&s->gb, 8);
|
||||||
get_bits(&s->gb, 8), get_bits(&s->gb, 8));
|
|
||||||
skip_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.num= get_bits(&s->gb, 16);
|
||||||
s->avctx->sample_aspect_ratio.den= 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_w = get_bits(&s->gb, 8);
|
||||||
t_h = get_bits(&s->gb, 8);
|
t_h = get_bits(&s->gb, 8);
|
||||||
if (t_w && t_h)
|
if (t_w && t_h)
|
||||||
|
@ -1636,6 +1642,7 @@ static int mjpeg_decode_com(MJpegDecodeContext *s)
|
||||||
else
|
else
|
||||||
cbuf[i] = 0;
|
cbuf[i] = 0;
|
||||||
|
|
||||||
|
if(s->avctx->debug & FF_DEBUG_PICT_INFO)
|
||||||
av_log(s->avctx, AV_LOG_INFO, "mjpeg comment: '%s'\n", cbuf);
|
av_log(s->avctx, AV_LOG_INFO, "mjpeg comment: '%s'\n", cbuf);
|
||||||
|
|
||||||
/* buggy avid, it puts EOI only at every 10th frame */
|
/* buggy avid, it puts EOI only at every 10th frame */
|
||||||
|
|
Loading…
Reference in New Issue