mpegvideo: rv10: Move function declaration to a separate header

diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
index 26f11637f9e8890b62447a7d673e8587abe6aab1..10dd6c2ae5fc21b95c3d70f3aa5ef3043d1bb0e5 100644 (file)
--- a/libavcodec/ituh263dec.c
+++ b/libavcodec/ituh263dec.c
@@ -41,6 +41,7 @@
 #include "mpegutils.h"
 #include "unary.h"
 #include "flv.h"
+#include "rv10.h"
 #include "mpeg4video.h"
 #include "mpegvideodata.h"
 

diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 667566aacca0b03c7b43a417af948988359347ff..372c6cfc20f16f8323d205d3e4a1fc5cdce61c90 100644 (file)
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -659,9 +659,4 @@ static inline int get_bits_diff(MpegEncContext *s){
     return bits - last;
 }
 
-/* rv10.c */
-int ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number);
-int ff_rv_decode_dc(MpegEncContext *s, int n);
-void ff_rv20_encode_picture_header(MpegEncContext *s, int picture_number);
-
 #endif /* AVCODEC_MPEGVIDEO_H */

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index e5081aecd83d0ca8a30a8949627bddca4cd4c512..db392afcca2328e02ff43ef04ed941383dcef330 100644 (file)
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -59,6 +59,7 @@
 #include "internal.h"
 #include "bytestream.h"
 #include "wmv2.h"
+#include "rv10.h"
 #include <limits.h>
 
 #define QUANT_BIAS_SHIFT 8

diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index 96902f1d5cf4e0063ae931c28e5abdc17df6dc9e..cd95b602da401ee72f50324510ffd93806abd057 100644 (file)
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -39,6 +39,7 @@
 #include "mpegvideo.h"
 #include "mpeg4video.h"
 #include "mpegvideodata.h"
+#include "rv10.h"
 
 #define RV_GET_MAJOR_VER(x)  ((x) >> 28)
 #define RV_GET_MINOR_VER(x) (((x) >> 20) & 0xFF)

diff --git a/libavcodec/rv10.h b/libavcodec/rv10.h
new file mode 100644 (file)
index 0000000..b44bc1f
--- /dev/null
+++ b/libavcodec/rv10.h
@@ -0,0 +1,33 @@
+/*
+ * RV10/RV20 decoder
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_RV10_H
+#define AVCODEC_RV10_H
+
+#include <stdint.h>
+
+#include "mpegvideo.h"
+
+int ff_rv_decode_dc(MpegEncContext *s, int n);
+
+int ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number);
+void ff_rv20_encode_picture_header(MpegEncContext *s, int picture_number);
+
+#endif /* AVCODEC_RV10_H */

diff --git a/libavcodec/rv10enc.c b/libavcodec/rv10enc.c
index 2eca9c3c88de7fe8db94744fd18a5df55756215d..98cd06e3eeba05d954ffb6113e2b5706a875f2e6 100644 (file)
--- a/libavcodec/rv10enc.c
+++ b/libavcodec/rv10enc.c
@@ -27,6 +27,7 @@
 
 #include "mpegvideo.h"
 #include "put_bits.h"
+#include "rv10.h"
 
 int ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number)
 {

diff --git a/libavcodec/rv20enc.c b/libavcodec/rv20enc.c
index 523315c66c41c9ed2892be2586ced99946aa3aa6..61e8a9d4c99971cf1f65fe65ec33b51e22e02ca6 100644 (file)
--- a/libavcodec/rv20enc.c
+++ b/libavcodec/rv20enc.c
@@ -30,6 +30,7 @@
 #include "h263.h"
 #include "h263data.h"
 #include "put_bits.h"
+#include "rv10.h"
 
 void ff_rv20_encode_picture_header(MpegEncContext *s, int picture_number){
     put_bits(&s->pb, 2, s->pict_type); //I 0 vs. 1 ?