diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-30 03:40:29 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-30 03:58:26 +0400 |
commit | be315a3232d96a2704e276f1ebe870a4d249d090 (patch) | |
tree | e550dd935580fdd29715c85e4d18bcb97b7fdecf /libavcodec/parser.c | |
parent | 500bf397153a7597ebd7bf2b410d71c6e8706198 (diff) | |
parent | 7089265756a84bf884a7c2290c6cda38d4dfd60f (diff) |
Merge remote branch 'qatar/master'
* qatar/master:
Duplicate AMV: disable DR1 and don't override EMU_EDGE
Duplicate lavf: inspect more frames for fps when container time base is coarse
Wrong and we have correct fix: Fix races in default av_log handler
vorbis: Replace sized int_fast integer types with plain int/unsigned.
Remove disabled non-optimized code variants.
NO bswap.h: Remove disabled code.
Remove some disabled printf debug cruft.
Replace more disabled printf() calls by av_dlog().
NO tests: Remove disabled code.
NO Replace some commented-out debug printf() / av_log() messages with av_dlog().
vorbisdec: Replace some sizeof(type) by sizeof(*variable).
NO vf_fieldorder: Replace FFmpeg by Libav in license boilerplate.
Conflicts:
libavcodec/h264.c
libavcodec/vorbisdec.c
libavutil/log.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/parser.c')
-rw-r--r-- | libavcodec/parser.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/parser.c b/libavcodec/parser.c index c1c8ce22ca..daea20e25c 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -272,12 +272,11 @@ int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_s pc->overread++; } -#if 0 if(pc->overread){ - printf("overread %d, state:%X next:%d index:%d o_index:%d\n", pc->overread, pc->state, next, pc->index, pc->overread_index); - printf("%X %X %X %X\n", (*buf)[0], (*buf)[1],(*buf)[2],(*buf)[3]); + av_dlog(pc, "overread %d, state:%X next:%d index:%d o_index:%d\n", + pc->overread, pc->state, next, pc->index, pc->overread_index); + av_dlog(pc, "%X %X %X %X\n", (*buf)[0], (*buf)[1],(*buf)[2],(*buf)[3]); } -#endif return 0; } |