virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'cus/stable'

Browse Source 
* cus/stable:
  ffplay: flush subtitle codecs as well with null packets
  ffplay: reorder the filters to ensure that inputs of the custom filters are merged first

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-05 14:12:46 +01:00
commit 95b13fb96f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ffplay.c
View File

@ -1727,7 +1727,8 @@ static int get_video_frame(VideoState *is, AVFrame *frame, AVPacket *pkt, int *s
static int configure_filtergraph(AVFilterGraph *graph, const char *filtergraph, static int configure_filtergraph(AVFilterGraph *graph, const char *filtergraph,
AVFilterContext *source_ctx, AVFilterContext *sink_ctx) AVFilterContext *source_ctx, AVFilterContext *sink_ctx)
{ {
int ret; int ret, i;
int nb_filters = graph->nb_filters;
AVFilterInOut *outputs = NULL, *inputs = NULL; AVFilterInOut *outputs = NULL, *inputs = NULL;
if (filtergraph) { if (filtergraph) {
@ -1755,6 +1756,10 @@ static int configure_filtergraph(AVFilterGraph *graph, const char *filtergraph,
goto fail; goto fail;
} }
/* Reorder the filters to ensure that inputs of the custom filters are merged first */
for (i = 0; i < graph->nb_filters - nb_filters; i++)
FFSWAP(AVFilterContext*, graph->filters[i], graph->filters[i + nb_filters]);
ret = avfilter_graph_config(graph, NULL); ret = avfilter_graph_config(graph, NULL);
fail: fail:
avfilter_inout_free(&outputs); avfilter_inout_free(&outputs);
@ -2943,6 +2948,8 @@ static int read_thread(void *arg)
packet_queue_put_nullpacket(&is->videoq, is->video_stream); packet_queue_put_nullpacket(&is->videoq, is->video_stream);
if (is->audio_stream >= 0) if (is->audio_stream >= 0)
packet_queue_put_nullpacket(&is->audioq, is->audio_stream); packet_queue_put_nullpacket(&is->audioq, is->audio_stream);
if (is->subtitle_stream >= 0)
packet_queue_put_nullpacket(&is->subtitleq, is->subtitle_stream);
SDL_Delay(10); SDL_Delay(10);
eof=0; eof=0;
continue; continue;