generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavf: use new decode API

Browse Source 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
wm4 2016-03-22 19:09:57 +01:00 committed by Anton Khirnov
parent 35846d93e0
commit 8bc4accc37
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavformat/utils.c
View File

@ -1945,22 +1945,22 @@ FF_ENABLE_DEPRECATION_WARNINGS
(!st->codec_info_nb_frames && (!st->codec_info_nb_frames &&
(avctx->codec->capabilities & AV_CODEC_CAP_CHANNEL_CONF)))) { (avctx->codec->capabilities & AV_CODEC_CAP_CHANNEL_CONF)))) {
got_picture = 0; got_picture = 0;
switch (avctx->codec_type) { if (avctx->codec_type == AVMEDIA_TYPE_VIDEO ||
case AVMEDIA_TYPE_VIDEO: avctx->codec_type == AVMEDIA_TYPE_AUDIO) {
ret = avcodec_decode_video2(avctx, frame, ret = avcodec_send_packet(avctx, &pkt);
&got_picture, &pkt); if (ret < 0 && ret != AVERROR(EAGAIN) && ret != AVERROR_EOF)
break; break;
case AVMEDIA_TYPE_AUDIO: if (ret >= 0)
ret = avcodec_decode_audio4(avctx, frame, &got_picture, &pkt); pkt.size = 0;
break; ret = avcodec_receive_frame(avctx, frame);
default: if (ret >= 0)
break; got_picture = 1;
if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
ret = 0;
} }
if (ret >= 0) { if (ret >= 0) {
if (got_picture) if (got_picture)
st->info->nb_decoded_frames++; st->info->nb_decoded_frames++;
pkt.data += ret;
pkt.size -= ret;
ret = got_picture; ret = got_picture;
} }
} }