diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 21:05:09 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 21:05:57 +0200 |
commit | b5c71fba594353b0676fa41c1f279d42adb6e716 (patch) | |
tree | 8608e7b1529f50deb737289b32b6b34415305b80 | |
parent | 218f58a16a3dd6c1b3eecef18bb45c04439c7799 (diff) | |
parent | e7af52a68dde9144b273a9598b60bf0f56e1323b (diff) | |
download | ffmpeg-b5c71fba594353b0676fa41c1f279d42adb6e716.tar.gz |
Merge commit 'e7af52a68dde9144b273a9598b60bf0f56e1323b'
* commit 'e7af52a68dde9144b273a9598b60bf0f56e1323b':
mpegvideo: rv10: Move function declaration to a separate header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-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 d81c5798dc..1a17f6e171 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -42,6 +42,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 a35897517a..7a33824c71 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -695,9 +695,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 1257ca7897..2b6740fdbd 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> #include "sp5x.h" diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index d63c633233..833e494120 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..364270e76a --- /dev/null +++ b/libavcodec/rv10.h @@ -0,0 +1,33 @@ +/* + * RV10/RV20 decoder + * + * 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_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 45f11365c9..61fa15ed5d 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 8e292ffa3a..a42d413a0c 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 ? |