mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

driver/audiodec/ffmpegdec: adapt to 2.0 ffmpeg API

Browse Source
This commit is contained in:
martii
2014-04-03 18:07:08 +02:00
committed by [CST] Focus
parent c5ab2b994f
commit 0d44d40dc0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver/audiodec/ffmpegdec.cpp
View File

@@ -318,12 +318,12 @@ CBaseDec::RetCode CFfmpegDec::Decoder(FILE *_in, int /*OutputFd*/, State* state,
while (packet.size > 0) { while (packet.size > 0) {
int got_frame = 0; int got_frame = 0;
if (!frame) { if (!frame) {
if (!(frame = avcodec_alloc_frame())) { if (!(frame = av_frame_alloc())) {
Status=DATA_ERR; Status=DATA_ERR;
break; break;
} }
} else } else
avcodec_get_frame_defaults(frame); av_frame_unref(frame);
int len = avcodec_decode_audio4(c, frame, &got_frame, &packet); int len = avcodec_decode_audio4(c, frame, &got_frame, &packet);
if (len < 0) { if (len < 0) {
@@ -378,7 +378,7 @@ CBaseDec::RetCode CFfmpegDec::Decoder(FILE *_in, int /*OutputFd*/, State* state,
swr_free(&swr); swr_free(&swr);
av_free(outbuf); av_free(outbuf);
av_free_packet(&rpacket); av_free_packet(&rpacket);
avcodec_free_frame(&frame); av_frame_free(&frame);
avcodec_close(c); avcodec_close(c);
//av_free(avcc); //av_free(avcc);