[FFmpeg-cvslog] lavfi/src_movie: Use movie_common_init instead individual wrappers

Alexander Strasser git at videolan.org
Tue Jun 18 00:04:22 CEST 2013


ffmpeg | branch: master | Alexander Strasser <eclipse7 at gmx.net> | Sun Jun 16 21:44:02 2013 +0200| [ac604e446b5e0031fad42ab190cc2019a898c241] | committer: Alexander Strasser

lavfi/src_movie: Use movie_common_init instead individual wrappers

Makes it easier to understand that there is no difference in init
callback for movie and amovie. Also saves a few lines of code.

Signed-off-by: Alexander Strasser <eclipse7 at gmx.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ac604e446b5e0031fad42ab190cc2019a898c241
---

 libavfilter/src_movie.c |   14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
index f52d3a4..7d3ce78 100644
--- a/libavfilter/src_movie.c
+++ b/libavfilter/src_movie.c
@@ -563,17 +563,12 @@ static int movie_request_frame(AVFilterLink *outlink)
 
 AVFILTER_DEFINE_CLASS(movie);
 
-static av_cold int movie_init(AVFilterContext *ctx)
-{
-    return movie_common_init(ctx);
-}
-
 AVFilter avfilter_avsrc_movie = {
     .name          = "movie",
     .description   = NULL_IF_CONFIG_SMALL("Read from a movie source."),
     .priv_size     = sizeof(MovieContext),
     .priv_class    = &movie_class,
-    .init          = movie_init,
+    .init          = movie_common_init,
     .uninit        = movie_uninit,
     .query_formats = movie_query_formats,
 
@@ -589,16 +584,11 @@ AVFilter avfilter_avsrc_movie = {
 #define amovie_options movie_options
 AVFILTER_DEFINE_CLASS(amovie);
 
-static av_cold int amovie_init(AVFilterContext *ctx)
-{
-    return movie_common_init(ctx);
-}
-
 AVFilter avfilter_avsrc_amovie = {
     .name          = "amovie",
     .description   = NULL_IF_CONFIG_SMALL("Read audio from a movie source."),
     .priv_size     = sizeof(MovieContext),
-    .init          = amovie_init,
+    .init          = movie_common_init,
     .uninit        = movie_uninit,
     .query_formats = movie_query_formats,
 



More information about the ffmpeg-cvslog mailing list