From 0d44d40dc076392fb7abfa2cb224daedecda665c Mon Sep 17 00:00:00 2001 From: martii Date: Thu, 3 Apr 2014 18:07:08 +0200 Subject: [PATCH] driver/audiodec/ffmpegdec: adapt to 2.0 ffmpeg API --- src/driver/audiodec/ffmpegdec.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/driver/audiodec/ffmpegdec.cpp b/src/driver/audiodec/ffmpegdec.cpp index 63713e7cf..1fe9e4380 100644 --- a/src/driver/audiodec/ffmpegdec.cpp +++ b/src/driver/audiodec/ffmpegdec.cpp @@ -318,12 +318,12 @@ CBaseDec::RetCode CFfmpegDec::Decoder(FILE *_in, int /*OutputFd*/, State* state, while (packet.size > 0) { int got_frame = 0; if (!frame) { - if (!(frame = avcodec_alloc_frame())) { + if (!(frame = av_frame_alloc())) { Status=DATA_ERR; break; } } else - avcodec_get_frame_defaults(frame); + av_frame_unref(frame); int len = avcodec_decode_audio4(c, frame, &got_frame, &packet); if (len < 0) { @@ -378,7 +378,7 @@ CBaseDec::RetCode CFfmpegDec::Decoder(FILE *_in, int /*OutputFd*/, State* state, swr_free(&swr); av_free(outbuf); av_free_packet(&rpacket); - avcodec_free_frame(&frame); + av_frame_free(&frame); avcodec_close(c); //av_free(avcc);