diff options
author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-06-10 16:29:06 +0300 |
---|---|---|
committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-06-12 14:26:54 +0300 |
commit | e7af52a68dde9144b273a9598b60bf0f56e1323b (patch) | |
tree | 02d50284df085ec579aceceb4bea916a2e4b6b65 /libavcodec | |
parent | e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d (diff) |
mpegvideo: rv10: Move function declaration to a separate header
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/ituh263dec.c | 1 | ||||
-rw-r--r-- | libavcodec/mpegvideo.h | 5 | ||||
-rw-r--r-- | libavcodec/mpegvideo_enc.c | 1 | ||||
-rw-r--r-- | libavcodec/rv10.c | 1 | ||||
-rw-r--r-- | libavcodec/rv10.h | 33 | ||||
-rw-r--r-- | libavcodec/rv10enc.c | 1 | ||||
-rw-r--r-- | libavcodec/rv20enc.c | 1 |
7 files changed, 38 insertions, 5 deletions
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 26f11637f9..10dd6c2ae5 100644 --- 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 667566aacc..372c6cfc20 100644 --- 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 e5081aecd8..db392afcca 100644 --- 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 96902f1d5c..cd95b602da 100644 --- 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 index 0000000000..b44bc1f1c3 --- /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 2eca9c3c88..98cd06e3ee 100644 --- 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 523315c66c..61e8a9d4c9 100644 --- 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 ? |