RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ffplay: fix indentation 

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2017-03-15 03:19:41 +01:00
parent 915bb78815
commit e854764729
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
ffplay.c
View File

@ -560,44 +560,44 @@ static int decoder_decode_frame(Decoder *d, AVFrame *frame, AVSubtitle *sub) {
AVPacket pkt; AVPacket pkt;
if (d->queue->serial == d->pkt_serial) { if (d->queue->serial == d->pkt_serial) {
do { do {
if (d->queue->abort_request) if (d->queue->abort_request)
return -1; return -1;
switch (d->avctx->codec_type) { switch (d->avctx->codec_type) {
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
ret = avcodec_receive_frame(d->avctx, frame); ret = avcodec_receive_frame(d->avctx, frame);
if (ret >= 0) { if (ret >= 0) {
if (decoder_reorder_pts == -1) { if (decoder_reorder_pts == -1) {
frame->pts = av_frame_get_best_effort_timestamp(frame); frame->pts = av_frame_get_best_effort_timestamp(frame);
} else if (!decoder_reorder_pts) { } else if (!decoder_reorder_pts) {
frame->pts = frame->pkt_dts; frame->pts = frame->pkt_dts;
} }
}
break;
case AVMEDIA_TYPE_AUDIO:
ret = avcodec_receive_frame(d->avctx, frame);
if (ret >= 0) {
AVRational tb = (AVRational){1, frame->sample_rate};
if (frame->pts != AV_NOPTS_VALUE)
frame->pts = av_rescale_q(frame->pts, av_codec_get_pkt_timebase(d->avctx), tb);
else if (d->next_pts != AV_NOPTS_VALUE)
frame->pts = av_rescale_q(d->next_pts, d->next_pts_tb, tb);
if (frame->pts != AV_NOPTS_VALUE) {
d->next_pts = frame->pts + frame->nb_samples;
d->next_pts_tb = tb;
}
}
break;
} }
break; if (ret == AVERROR_EOF) {
case AVMEDIA_TYPE_AUDIO: d->finished = d->pkt_serial;
ret = avcodec_receive_frame(d->avctx, frame); avcodec_flush_buffers(d->avctx);
if (ret >= 0) { return 0;
AVRational tb = (AVRational){1, frame->sample_rate};
if (frame->pts != AV_NOPTS_VALUE)
frame->pts = av_rescale_q(frame->pts, av_codec_get_pkt_timebase(d->avctx), tb);
else if (d->next_pts != AV_NOPTS_VALUE)
frame->pts = av_rescale_q(d->next_pts, d->next_pts_tb, tb);
if (frame->pts != AV_NOPTS_VALUE) {
d->next_pts = frame->pts + frame->nb_samples;
d->next_pts_tb = tb;
}
} }
break; if (ret >= 0)
} return 1;
if (ret == AVERROR_EOF) { } while (ret != AVERROR(EAGAIN));
d->finished = d->pkt_serial;
avcodec_flush_buffers(d->avctx);
return 0;
}
if (ret >= 0)
return 1;
} while (ret != AVERROR(EAGAIN));
} }
do { do {