highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftools/ffplay: reindent and some minor cosmetics

Browse Source 
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2021-02-07 18:55:31 +01:00
parent 36d671438a
commit 9edec9206a
1 changed files with 42 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fftools/ffplay.c
View File

@@ -654,7 +654,6 @@ static int decoder_decode_frame(Decoder *d, AVFrame *frame, AVSubtitle *sub) {
av_packet_unref(d->pkt); av_packet_unref(d->pkt);
} while (1); } while (1);
{
if (d->avctx->codec_type == AVMEDIA_TYPE_SUBTITLE) { if (d->avctx->codec_type == AVMEDIA_TYPE_SUBTITLE) {
int got_frame = 0; int got_frame = 0;
ret = avcodec_decode_subtitle2(d->avctx, sub, &got_frame, d->pkt); ret = avcodec_decode_subtitle2(d->avctx, sub, &got_frame, d->pkt);
@@ -677,7 +676,6 @@ static int decoder_decode_frame(Decoder *d, AVFrame *frame, AVSubtitle *sub) {
} }
} }
} }
}
static void decoder_destroy(Decoder *d) { static void decoder_destroy(Decoder *d) {
av_packet_free(&d->pkt); av_packet_free(&d->pkt);
@@ -2968,15 +2966,12 @@ static int read_thread(void *arg)
av_log(NULL, AV_LOG_ERROR, av_log(NULL, AV_LOG_ERROR,
"%s: error while seeking\n", is->ic->url); "%s: error while seeking\n", is->ic->url);
} else { } else {
if (is->audio_stream >= 0) { if (is->audio_stream >= 0)
packet_queue_flush(&is->audioq); packet_queue_flush(&is->audioq);
} if (is->subtitle_stream >= 0)
if (is->subtitle_stream >= 0) {
packet_queue_flush(&is->subtitleq); packet_queue_flush(&is->subtitleq);
} if (is->video_stream >= 0)
if (is->video_stream >= 0) {
packet_queue_flush(&is->videoq); packet_queue_flush(&is->videoq);
}
if (is->seek_flags & AVSEEK_FLAG_BYTE) { if (is->seek_flags & AVSEEK_FLAG_BYTE) {
set_clock(&is->extclk, NAN, 0); set_clock(&is->extclk, NAN, 0);
} else { } else {