diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-28 13:36:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-28 13:54:40 +0200 |
| commit | 2acb5cd90793de7f375bf6ebf4eabe2b59a2ecc3 (patch) | |
| tree | 5d827d355bab646ca6ccdebe930ac927a02c3713 /libavcodec/h264_refs.c | |
| parent | 4fefe91a33956007f17cfd6e0c5ee1cb3a3f36d8 (diff) | |
| parent | d16860a237ae56a21d051df6556c40de9be53faa (diff) | |
| download | ffmpeg-2acb5cd90793de7f375bf6ebf4eabe2b59a2ecc3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libopus: Remap channels using libopus' internal remapping.
Opus decoder using libopus
avcodec: document the use of AVCodecContext.delay for audio decoding
vc1dec: add flush function for WMV9 and VC-1 decoders
http: Increase buffer sizes to cope with longer URIs
nutenc: const correctness for ff_put_v_trace/put_s_trace function arguments
h264_refs: Fix debug tprintf argument types
golomb: const correctness for get_ue()/get_se() function arguments
get_bits: const correctness for get_bits_trace()/get_xbits_trace() arguments
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/version.h
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_refs.c')
| -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 d68a7d8b0f..c15e92845d 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -147,11 +147,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 |