[FFmpeg-cvslog] avodec/h264dec: fix compilation with -DTRACE
James Almer
git at videolan.org
Thu Jun 16 23:53:38 CEST 2016
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Jun 16 18:52:23 2016 -0300| [94011f994ab2e531a49fabbb2c86e735f87df3ca] | committer: James Almer
avodec/h264dec: fix compilation with -DTRACE
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=94011f994ab2e531a49fabbb2c86e735f87df3ca
---
libavcodec/h264_cabac.c | 2 +-
libavcodec/h264_cavlc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index ddabe3b..85eeb7a 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -1923,7 +1923,7 @@ int ff_h264_decode_mb_cabac(const H264Context *h, H264SliceContext *sl)
mb_xy = sl->mb_xy = sl->mb_x + sl->mb_y*h->mb_stride;
- ff_tlog(h->avctx, "pic:%d mb:%d/%d\n", h->frame_num, sl->mb_x, sl->mb_y);
+ ff_tlog(h->avctx, "pic:%d mb:%d/%d\n", h->poc.frame_num, sl->mb_x, sl->mb_y);
if (sl->slice_type_nos != AV_PICTURE_TYPE_I) {
int skip;
/* a skipped mb needs the aff flag from the following mb */
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c
index 95b3778..a280a9c 100644
--- a/libavcodec/h264_cavlc.c
+++ b/libavcodec/h264_cavlc.c
@@ -714,7 +714,7 @@ int ff_h264_decode_mb_cavlc(const H264Context *h, H264SliceContext *sl)
mb_xy = sl->mb_xy = sl->mb_x + sl->mb_y*h->mb_stride;
- ff_tlog(h->avctx, "pic:%d mb:%d/%d\n", h->frame_num, sl->mb_x, sl->mb_y);
+ ff_tlog(h->avctx, "pic:%d mb:%d/%d\n", h->poc.frame_num, sl->mb_x, sl->mb_y);
cbp = 0; /* avoid warning. FIXME: find a solution without slowing
down the code */
if (sl->slice_type_nos != AV_PICTURE_TYPE_I) {
More information about the ffmpeg-cvslog
mailing list