Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

* commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521':
  alsdec: Check k used for rice decoder.
  avfiltergraph: silence an uninitialized variable warning
  xsubenc: reindent
  lavc: replace AVCodecContext.encode with subtitle-specific callback
  lavc: add const to private codec class initialization.
  avconv: don't pass a bogus parameter to avfilter_graph_create_filter().
  id3v2: strdup the genre name explicitly.
  lavf/id3v2: do not export empty fields.
  buffersrc: add const to the AVFrame* argument of av_buffersrc_write_frame()
  lavfi: replace empty input/output lists with null pointers

Conflicts:
	ffmpeg_filter.c
	libavcodec/alsdec.c
	libavcodec/dvdsubenc.c
	libavcodec/utils.c
	libavcodec/v210dec.h
	libavfilter/af_channelsplit.c
	libavfilter/avfiltergraph.c
	libavfilter/buffersrc.c
	libavfilter/src_movie.c
	libavfilter/vf_ass.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

15 files changed, 22 insertions, 19 deletions

diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c
index cfe23159e2..9d0f998f62 100644
--- a/libavfilter/af_amix.c
+++ b/libavfilter/af_amix.c
@@ -549,7 +549,7 @@ AVFilter avfilter_af_amix = {
     .uninit         = uninit,
     .query_formats  = query_formats,
 
-    .inputs    = (const AVFilterPad[]) {{ .name = NULL}},
+    .inputs    = NULL,
     .outputs   = (const AVFilterPad[]) {{ .name          = "default",
                                           .type          = AVMEDIA_TYPE_AUDIO,
                                           .config_props  = config_output,
diff --git a/libavfilter/af_channelsplit.c b/libavfilter/af_channelsplit.c
index 06f786842f..81f91ad393 100644
--- a/libavfilter/af_channelsplit.c
+++ b/libavfilter/af_channelsplit.c
@@ -142,6 +142,6 @@ AVFilter avfilter_af_channelsplit = {
                                        .type           = AVMEDIA_TYPE_AUDIO,
                                        .filter_samples = filter_samples, },
                                      { NULL }},
-    .outputs = (const AVFilterPad[]){{ NULL }},
+    .outputs = NULL,
     .priv_class = &channelsplit_class,
 };
diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index 0e75602fd3..5e338f0efb 100644
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -494,7 +494,7 @@ AVFilter avfilter_af_join = {
     .uninit         = join_uninit,
     .query_formats  = join_query_formats,
 
-    .inputs  = (const AVFilterPad[]){{ NULL }},
+    .inputs  = NULL,
     .outputs = (const AVFilterPad[]){{ .name          = "default",
                                        .type          = AVMEDIA_TYPE_AUDIO,
                                        .config_props  = join_config_output,
diff --git a/libavfilter/asink_anullsink.c b/libavfilter/asink_anullsink.c
index 506619bf1a..4eee5041df 100644
--- a/libavfilter/asink_anullsink.c
+++ b/libavfilter/asink_anullsink.c
@@ -41,5 +41,5 @@ AVFilter avfilter_asink_anullsink = {
         },
         { .name = NULL},
     },
-    .outputs   = (const AVFilterPad[]) {{ .name = NULL }},
+    .outputs   = NULL,
 };
diff --git a/libavfilter/asrc_anullsrc.c b/libavfilter/asrc_anullsrc.c
index 5cdf126fd5..4e28e294af 100644
--- a/libavfilter/asrc_anullsrc.c
+++ b/libavfilter/asrc_anullsrc.c
@@ -126,7 +126,7 @@ AVFilter avfilter_asrc_anullsrc = {
     .init        = init,
     .priv_size   = sizeof(ANullContext),
 
-    .inputs      = (const AVFilterPad[]) {{ .name = NULL}},
+    .inputs      = NULL,
 
     .outputs     = (const AVFilterPad[]) {{ .name = "default",
                                             .type = AVMEDIA_TYPE_AUDIO,
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 3bac29d5ac..9f49a8b2b1 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -436,6 +436,9 @@ static int pad_count(const AVFilterPad *pads)
 {
     int count;
 
+    if (!pads)
+        return 0;
+
     for(count = 0; pads->name; count ++) pads ++;
     return count;
 }
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index f98e0e40f3..b745c3c991 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -679,7 +679,7 @@ static void swap_channel_layouts_on_filter(AVFilterContext *filter)
                 best_count_diff = count_diff;
             }
         }
-        av_assert1(best_idx>=0);
+        av_assert0(best_idx >= 0);
         FFSWAP(uint64_t, outlink->in_channel_layouts->channel_layouts[0],
                outlink->in_channel_layouts->channel_layouts[best_idx]);
     }
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c
index 50cd6d4e96..2e84fb4507 100644
--- a/libavfilter/buffersink.c
+++ b/libavfilter/buffersink.c
@@ -156,7 +156,7 @@ AVFilter avfilter_vsink_buffer = {
                                           .min_perms     = AV_PERM_READ,
                                           .needs_fifo    = 1 },
                                         { .name = NULL }},
-    .outputs   = (const AVFilterPad[]) {{ .name = NULL }},
+    .outputs   = NULL,
 };
 
 AVFilter avfilter_asink_abuffer = {
@@ -175,5 +175,5 @@ AVFilter avfilter_asink_abuffer = {
                                           .min_perms      = AV_PERM_READ,
                                           .needs_fifo     = 1 },
                                         { .name = NULL }},
-    .outputs   = (const AVFilterPad[]) {{ .name = NULL }},
+    .outputs   = NULL,
 };
diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c
index 25c6386d4e..db2db3a482 100644
--- a/libavfilter/buffersrc.c
+++ b/libavfilter/buffersrc.c
@@ -94,7 +94,7 @@ int av_buffersrc_add_frame(AVFilterContext *buffer_src,
     return ret;
 }
 
-int av_buffersrc_write_frame(AVFilterContext *buffer_filter, AVFrame *frame)
+int av_buffersrc_write_frame(AVFilterContext *buffer_filter, const AVFrame *frame)
 {
     return av_buffersrc_add_frame(buffer_filter, frame, 0);
 }
@@ -409,7 +409,7 @@ AVFilter avfilter_vsrc_buffer = {
     .init      = init_video,
     .uninit    = uninit,
 
-    .inputs    = (const AVFilterPad[]) {{ .name = NULL }},
+    .inputs    = NULL,
     .outputs   = (const AVFilterPad[]) {{ .name            = "default",
                                           .type            = AVMEDIA_TYPE_VIDEO,
                                           .request_frame   = request_frame,
@@ -428,7 +428,7 @@ AVFilter avfilter_asrc_abuffer = {
     .init      = init_audio,
     .uninit    = uninit,
 
-    .inputs    = (const AVFilterPad[]) {{ .name = NULL }},
+    .inputs    = NULL,
     .outputs   = (const AVFilterPad[]) {{ .name            = "default",
                                           .type            = AVMEDIA_TYPE_AUDIO,
                                           .request_frame   = request_frame,
diff --git a/libavfilter/buffersrc.h b/libavfilter/buffersrc.h
index d25316125f..7f3c8d8ec3 100644
--- a/libavfilter/buffersrc.h
+++ b/libavfilter/buffersrc.h
@@ -90,6 +90,6 @@ int av_buffersrc_buffer(AVFilterContext *s, AVFilterBufferRef *buf);
  * @warning frame data will be memcpy()ed, which may be a big performance
  *          hit. Use av_buffersrc_buffer() to avoid copying the data.
  */
-int av_buffersrc_write_frame(AVFilterContext *s, AVFrame *frame);
+int av_buffersrc_write_frame(AVFilterContext *s, const AVFrame *frame);
 
 #endif /* AVFILTER_BUFFERSRC_H */
diff --git a/libavfilter/split.c b/libavfilter/split.c
index b0d36f34ce..e036a93f21 100644
--- a/libavfilter/split.c
+++ b/libavfilter/split.c
@@ -133,7 +133,7 @@ AVFilter avfilter_vf_split = {
                                           .draw_slice      = draw_slice,
                                           .end_frame       = end_frame, },
                                         { .name = NULL}},
-    .outputs   = (const AVFilterPad[]) {{ .name = NULL}},
+    .outputs   = NULL,
 };
 
 static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *samplesref)
@@ -169,5 +169,5 @@ AVFilter avfilter_af_asplit = {
                                         .get_audio_buffer = ff_null_get_audio_buffer,
                                         .filter_samples   = filter_samples },
                                       { .name = NULL }},
-    .outputs = (const AVFilterPad[]) {{ .name = NULL }},
+    .outputs = NULL,
 };
diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
index f221286c02..41500f3e92 100644
--- a/libavfilter/src_movie.c
+++ b/libavfilter/src_movie.c
@@ -611,7 +611,7 @@ AVFilter avfilter_avsrc_movie = {
     .uninit        = movie_uninit,
     .query_formats = movie_query_formats,
 
-    .inputs    = (const AVFilterPad[]) {{ .name = NULL }},
+    .inputs    = NULL,
     .outputs   = (const AVFilterPad[]) {{ .name = NULL }},
     .priv_class = &movie_class,
 };
diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c
index b40a684b7c..cd0cd6b778 100644
--- a/libavfilter/vf_frei0r.c
+++ b/libavfilter/vf_frei0r.c
@@ -488,7 +488,7 @@ AVFilter avfilter_vsrc_frei0r_src = {
 
     .query_formats = query_formats,
 
-    .inputs    = (const AVFilterPad[]) {{ .name = NULL}},
+    .inputs    = NULL,
 
     .outputs   = (const AVFilterPad[]) {{ .name            = "default",
                                           .type            = AVMEDIA_TYPE_VIDEO,
diff --git a/libavfilter/vsink_nullsink.c b/libavfilter/vsink_nullsink.c
index b5aae21f77..148b250f58 100644
--- a/libavfilter/vsink_nullsink.c
+++ b/libavfilter/vsink_nullsink.c
@@ -45,5 +45,5 @@ AVFilter avfilter_vsink_nullsink = {
         },
         { .name = NULL},
     },
-    .outputs   = (const AVFilterPad[]) {{ .name = NULL }},
+    .outputs   = NULL,
 };
diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c
index 524ba7050e..28d114e379 100644
--- a/libavfilter/vsrc_testsrc.c
+++ b/libavfilter/vsrc_testsrc.c
@@ -533,7 +533,7 @@ AVFilter avfilter_vsrc_testsrc = {
 
     .query_formats   = test_query_formats,
 
-    .inputs    = (const AVFilterPad[]) {{ .name = NULL}},
+    .inputs    = NULL,
 
     .outputs   = (const AVFilterPad[]) {{ .name = "default",
                                           .type = AVMEDIA_TYPE_VIDEO,
@@ -647,7 +647,7 @@ AVFilter avfilter_vsrc_rgbtestsrc = {
 
     .query_formats   = rgbtest_query_formats,
 
-    .inputs    = (const AVFilterPad[]) {{ .name = NULL}},
+    .inputs    = NULL,
 
     .outputs   = (const AVFilterPad[]) {{ .name = "default",
                                           .type = AVMEDIA_TYPE_VIDEO,