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 /libavcodec/msmpeg4.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 'libavcodec/msmpeg4.c')
| -rw-r--r-- | libavcodec/msmpeg4.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index 9cbe2b8bef..1ba3cdb2fa 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -617,10 +617,6 @@ void msmpeg4_encode_mb(MpegEncContext * s, } coded_cbp |= val << (5 - i); } -#if 0 - if (coded_cbp) - printf("cbp=%x %x\n", cbp, coded_cbp); -#endif if(s->msmpeg4_version<=2){ if (s->pict_type == FF_I_TYPE) { @@ -1383,17 +1379,6 @@ int msmpeg4_decode_picture_header(MpegEncContext * s) { int code; -#if 0 -{ -int i; -for(i=0; i<s->gb.size_in_bits; i++) - av_log(s->avctx, AV_LOG_DEBUG, "%d", get_bits1(&s->gb)); -// get_bits1(&s->gb); -av_log(s->avctx, AV_LOG_DEBUG, "END\n"); -return -1; -} -#endif - if(s->msmpeg4_version==1){ int start_code = get_bits_long(&s->gb, 32); if(start_code!=0x00000100){ |