avcodec/flv.h: Split header into encoder-only and decoder-only headers

Signed-off-by: Andreas Rheinhardt <[email protected]>

Author: mkver

libavcodec/flvdec.c

@@ -20,7 +20,7 @@
 
 #include "libavutil/imgutils.h"
 
-#include "flv.h"
+#include "flvdec.h"
 #include "h263dec.h"
 #include "mpegvideo.h"
 #include "mpegvideodata.h"

libavcodec/flvdec.h

@@ -0,0 +1,28 @@
+/*
+ * FLV decoder header.
+ *
+ * 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.1 of the License, or (at your option) any later version.
+ *
+ * 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_FLVDEC_H
+#define AVCODEC_FLVDEC_H
+
+#include "mpegvideo.h"
+
+int ff_flv_decode_picture_header(MpegEncContext *s);
+
+#endif /* AVCODEC_FLVDEC_H */

libavcodec/flvenc.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "flv.h"
+#include "flvenc.h"
 #include "h263data.h"
 #include "mpegvideo.h"
 #include "mpegvideodata.h"

libavcodec/flv.h libavcodec/flvenc.h

@@ -1,5 +1,5 @@
 /*
- * FLV specific private header.
+ * FLV encoder header.
  *
  * This file is part of FFmpeg.
  *
@@ -18,17 +18,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_FLV_H
-#define AVCODEC_FLV_H
+#ifndef AVCODEC_FLVENC_H
+#define AVCODEC_FLVENC_H
 
-#include "get_bits.h"
 #include "mpegvideo.h"
 #include "put_bits.h"
 
 void ff_flv_encode_picture_header(MpegEncContext *s, int picture_number);
 void ff_flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level, int run,
                            int last);
 
-int ff_flv_decode_picture_header(MpegEncContext *s);
-
 #endif /* AVCODEC_FLV_H */

libavcodec/h263dec.c

@@ -27,11 +27,9 @@
 
 #define UNCHECKED_BITSTREAM_READER 1
 
-#include "libavutil/video_enc_params.h"
-
 #include "avcodec.h"
 #include "error_resilience.h"
-#include "flv.h"
+#include "flvdec.h"
 #include "h263.h"
 #include "h263dec.h"
 #if FF_API_FLAG_TRUNCATED

libavcodec/ituh263dec.c

@@ -28,7 +28,6 @@
  */
 
 #define UNCHECKED_BITSTREAM_READER 1
-#include <limits.h>
 
 #include "libavutil/attributes.h"
 #include "libavutil/imgutils.h"
@@ -43,7 +42,6 @@
 #include "mathops.h"
 #include "mpegutils.h"
 #include "unary.h"
-#include "flv.h"
 #include "rv10.h"
 #include "mpeg4video.h"
 #include "mpegvideodata.h"

libavcodec/ituh263enc.c

@@ -34,12 +34,12 @@
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "mpegvideodata.h"
+#include "flvenc.h"
 #include "h263.h"
 #include "h263enc.h"
 #include "h263data.h"
 #include "mathops.h"
 #include "mpegutils.h"
-#include "flv.h"
 #include "internal.h"
 
 /**

libavcodec/mpegvideo_enc.c

@@ -61,9 +61,8 @@
 #include "pixblockdsp.h"
 #include "qpeldsp.h"
 #include "faandct.h"
-#include "thread.h"
 #include "aandcttab.h"
-#include "flv.h"
+#include "flvenc.h"
 #include "mpeg4video.h"
 #include "mpeg4videodata.h"
 #include "mpeg4videoenc.h"