diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-11 22:50:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-11 22:50:22 +0200 |
| commit | 4f6df20a008e52e767550e1ea94280a15c1408b6 (patch) | |
| tree | 85c15434d2d725cd018a878f7bef75ee13765817 /libavcodec | |
| parent | 8e357e8e759b36e5609ccd12a9e324aee0e8afc8 (diff) | |
| parent | e1ce756844e684876318570dcebc74bc66c084f0 (diff) | |
| download | ffmpeg-4f6df20a008e52e767550e1ea94280a15c1408b6.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avplay: Don't free video filters string until the end of decoding.
movenc: small refactor mov_write_packet
movenc: remove redundant check
interplayvideo: fix av_dlog parameter type mismatch
Drop some pointless #ifdefs.
Conflicts:
libavcodec/interplayvideo.c
libavcodec/libxvidff.c
libavcodec/snowenc.c
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/interplayvideo.c | 5 | ||||
| -rw-r--r-- | libavcodec/libxvidff.c | 3 | ||||
| -rw-r--r-- | libavcodec/snowenc.c | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c index 61cc6801c9..76adad9156 100644 --- a/libavcodec/interplayvideo.c +++ b/libavcodec/interplayvideo.c @@ -907,8 +907,9 @@ static void ipvideo_decode_opcodes(IpvideoContext *s) for (x = 0; x < s->avctx->width; x += 8) { opcode = get_bits(&gb, 4); - av_dlog(s->avctx, "block @ (%3d, %3d): encoding 0x%X, data ptr @ %p\n", - x, y, opcode, s->stream_ptr.buffer); + av_dlog(s->avctx, + " block @ (%3d, %3d): encoding 0x%X, data ptr offset %d\n", + x, y, opcode, bytestream2_tell(&s->stream_ptr)); if (!s->is_16bpp) { s->pixel_ptr = s->current_frame.data[0] + x diff --git a/libavcodec/libxvidff.c b/libavcodec/libxvidff.c index 33cf997e17..811efc3793 100644 --- a/libavcodec/libxvidff.c +++ b/libavcodec/libxvidff.c @@ -77,7 +77,6 @@ int xvid_strip_vol_header(AVCodecContext *avctx, AVPacket *pkt, unsigned int hea int xvid_ff_2pass(void *ref, int opt, void *p1, void *p2); void xvid_correct_framerate(AVCodecContext *avctx); -#if CONFIG_LIBXVID_ENCODER /** * Create the private context for the encoder. @@ -791,5 +790,3 @@ AVCodec ff_libxvid_encoder = { .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV420P, PIX_FMT_NONE }, .long_name = NULL_IF_CONFIG_SMALL("libxvidcore MPEG-4 part 2"), }; - -#endif /* CONFIG_LIBXVID_ENCODER */ diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 61acf85615..ea66d5fd9c 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -153,7 +153,6 @@ static void dwt_quantize(SnowContext *s, Plane *p, DWTELEM *buffer, int width, i #endif /* QUANTIZE2==1 */ -#if CONFIG_SNOW_ENCODER static av_cold int encode_init(AVCodecContext *avctx) { SnowContext *s = avctx->priv_data; @@ -1927,7 +1926,6 @@ AVCodec ff_snow_encoder = { .long_name = NULL_IF_CONFIG_SMALL("Snow"), .priv_class = &snowenc_class, }; -#endif #ifdef TEST |