From d5551265f3004d70bb349aa06bc16ce3225c6f4d Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sat, 30 Apr 2011 11:55:06 +0200 Subject: [PATCH] lavc: remove disabled avcodec_decode_video() code Fix warning: libavcodec/utils.c: At top level: libavcodec/utils.c:714:5: warning: "FF_API_VIDEO_OLD" is not defined Also fix trac issue #139. --- libavcodec/utils.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 45bf73ff7e..ce33c4f5de 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -710,23 +710,6 @@ static int64_t guess_correct_pts(AVCodecContext *ctx, return pts; } - -#if FF_API_VIDEO_OLD -int attribute_align_arg avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture, - int *got_picture_ptr, - const uint8_t *buf, int buf_size) -{ - AVPacket avpkt; - av_init_packet(&avpkt); - avpkt.data = buf; - avpkt.size = buf_size; - // HACK for CorePNG to decode as normal PNG by default - avpkt.flags = AV_PKT_FLAG_KEY; - - return avcodec_decode_video2(avctx, picture, got_picture_ptr, &avpkt); -} -#endif - int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, int *got_picture_ptr, AVPacket *avpkt)