diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 21:36:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 21:36:34 +0100 |
| commit | c9a38ffe2ff57f71f72caee98a94eb535b5703c8 (patch) | |
| tree | 1b538eb5a76ccf892cb863b4489ac0e72a64b758 | |
| parent | 60190d8612d10d58bb827709550e5ef4dafc50f7 (diff) | |
| parent | 233d1b4861e252cbc4571840e7f264e1db151c13 (diff) | |
| download | ffmpeg-c9a38ffe2ff57f71f72caee98a94eb535b5703c8.tar.gz | |
Merge commit '233d1b4861e252cbc4571840e7f264e1db151c13' into release/0.10
* commit '233d1b4861e252cbc4571840e7f264e1db151c13':
h264_refs: Fix debug tprintf argument types
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264_refs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index fc59a9b37b..003d724407 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -155,11 +155,11 @@ int ff_h264_fill_default_ref_list(H264Context *h){ } #ifdef TRACE for (i=0; i<h->ref_count[0]; i++) { - tprintf(h->s.avctx, "List0: %s fn:%d 0x%p\n", (h->default_ref_list[0][i].long_ref ? "LT" : "ST"), h->default_ref_list[0][i].pic_id, h->default_ref_list[0][i].data[0]); + tprintf(h->s.avctx, "List0: %s fn:%d 0x%p\n", (h->default_ref_list[0][i].long_ref ? "LT" : "ST"), h->default_ref_list[0][i].pic_id, h->default_ref_list[0][i].f.data[0]); } if(h->slice_type_nos==AV_PICTURE_TYPE_B){ for (i=0; i<h->ref_count[1]; i++) { - tprintf(h->s.avctx, "List1: %s fn:%d 0x%p\n", (h->default_ref_list[1][i].long_ref ? "LT" : "ST"), h->default_ref_list[1][i].pic_id, h->default_ref_list[1][i].data[0]); + tprintf(h->s.avctx, "List1: %s fn:%d 0x%p\n", (h->default_ref_list[1][i].long_ref ? "LT" : "ST"), h->default_ref_list[1][i].pic_id, h->default_ref_list[1][i].f.data[0]); } } #endif |