factorize (untested)

[ffmpeg] / libavformat / yuv4mpeg.c

diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c
index be49ff484bb223e67a5aaffd5d3ff479e61ad345..70214ae00f8d9e7413090e9b877e15b21bbf32da 100644 (file)
--- a/libavformat/yuv4mpeg.c
+++ b/libavformat/yuv4mpeg.c
@@ -2,18 +2,20 @@
  * YUV4MPEG format
  * Copyright (c) 2001, 2002, 2003 Fabrice Bellard.
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
@@ -27,8 +29,6 @@ struct frame_attributes {
     int top_field_first;
 };
 
-#ifdef CONFIG_MUXERS
-
 static int yuv4_generate_header(AVFormatContext *s, char* buf)
 {
     AVStream *st;
@@ -171,6 +171,7 @@ static int yuv4_write_trailer(AVFormatContext *s)
     return 0;
 }
 
+#ifdef CONFIG_YUV4MPEGPIPE_MUXER
 AVOutputFormat yuv4mpegpipe_muxer = {
     "yuv4mpegpipe",
     "YUV4MPEG pipe format",
@@ -184,7 +185,7 @@ AVOutputFormat yuv4mpegpipe_muxer = {
     yuv4_write_trailer,
     .flags = AVFMT_RAWPICTURE,
 };
-#endif //CONFIG_MUXERS
+#endif
 
 /* Header size increased to allow room for optional flags */
 #define MAX_YUV4_HEADER 80
@@ -393,6 +394,7 @@ static int yuv4_probe(AVProbeData *pd)
         return 0;
 }
 
+#ifdef CONFIG_YUV4MPEGPIPE_DEMUXER
 AVInputFormat yuv4mpegpipe_demuxer = {
     "yuv4mpegpipe",
     "YUV4MPEG pipe format",
@@ -403,13 +405,4 @@ AVInputFormat yuv4mpegpipe_demuxer = {
     yuv4_read_close,
     .extensions = "y4m"
 };
-
-int yuv4mpeg_init(void)
-{
-    av_register_input_format(&yuv4mpegpipe_demuxer);
-#ifdef CONFIG_MUXERS
-    av_register_output_format(&yuv4mpegpipe_muxer);
-#endif //CONFIG_MUXERS
-    return 0;
-}
-
+#endif