diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-30 01:40:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-30 01:58:26 +0200 |
| commit | be315a3232d96a2704e276f1ebe870a4d249d090 (patch) | |
| tree | e550dd935580fdd29715c85e4d18bcb97b7fdecf /libavformat/ffmdec.c | |
| parent | 500bf397153a7597ebd7bf2b410d71c6e8706198 (diff) | |
| parent | 7089265756a84bf884a7c2290c6cda38d4dfd60f (diff) | |
| download | ffmpeg-be315a3232d96a2704e276f1ebe870a4d249d090.tar.gz | |
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 'libavformat/ffmdec.c')
| -rw-r--r-- | libavformat/ffmdec.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index a42bb69679..604e75183c 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -416,9 +416,6 @@ static int ffm_read_packet(AVFormatContext *s, AVPacket *pkt) if (ffm->header[1] & FLAG_DTS) if (ffm_read_data(s, ffm->header+16, 4, 1) != 4) return -1; -#if 0 - av_hexdump_log(s, AV_LOG_DEBUG, ffm->header, FRAME_HEADER_SIZE); -#endif ffm->read_state = READ_DATA; /* fall thru */ case READ_DATA: |