aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <clement.boesch@smartjog.com>2011-10-12 17:06:18 +0200
committerClément Bœsch <ubitux@gmail.com>2011-10-17 09:14:36 +0200
commitefb1ce28b26b66f1f72f85fcdfaf16d7fe6519fe (patch)
tree68bf778a3c40f0fd31a275aef5e0c435b2ae0b6e
parent539399d4d1947988c189f72467da0c2532294388 (diff)
downloadffmpeg-efb1ce28b26b66f1f72f85fcdfaf16d7fe6519fe.tar.gz
mpeg12: use drop_frame_flag to fix timecode debug format.
-rw-r--r--libavcodec/mpeg12.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index d7e266b322..6dcecf7b0c 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -2160,14 +2160,14 @@ static void mpeg_decode_gop(AVCodecContext *avctx,
Mpeg1Context *s1 = avctx->priv_data;
MpegEncContext *s = &s1->mpeg_enc_ctx;
+ int drop_frame_flag;
int time_code_hours, time_code_minutes;
int time_code_seconds, time_code_pictures;
int broken_link;
init_get_bits(&s->gb, buf, buf_size*8);
- skip_bits1(&s->gb); /* drop_frame_flag */
-
+ drop_frame_flag = get_bits(&s->gb, 1);
time_code_hours = get_bits(&s->gb, 5);
time_code_minutes = get_bits(&s->gb, 6);
skip_bits1(&s->gb); // marker bit
@@ -2181,8 +2181,9 @@ static void mpeg_decode_gop(AVCodecContext *avctx,
broken_link = get_bits1(&s->gb);
if (s->avctx->debug & FF_DEBUG_PICT_INFO)
- av_log(s->avctx, AV_LOG_DEBUG, "GOP (%2d:%02d:%02d.[%02d]) closed_gop=%d broken_link=%d\n",
+ av_log(s->avctx, AV_LOG_DEBUG, "GOP (%02d:%02d:%02d%c[%02d]) closed_gop=%d broken_link=%d\n",
time_code_hours, time_code_minutes, time_code_seconds,
+ drop_frame_flag ? ';' : ':',
time_code_pictures, s->closed_gop, broken_link);
}
/**