avcodec/rv10.h: Split header into decoder- and encoder-only parts

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
release/5.1
Andreas Rheinhardt 3 years ago
parent 9856f6a443
commit 9fa4e0e555
  1. 2
      libavcodec/ituh263dec.c
  2. 2
      libavcodec/mpegvideo_enc.c
  3. 2
      libavcodec/rv10.c
  4. 28
      libavcodec/rv10dec.h
  5. 2
      libavcodec/rv10enc.c
  6. 12
      libavcodec/rv10enc.h
  7. 2
      libavcodec/rv20enc.c

@ -42,7 +42,7 @@
#include "mathops.h" #include "mathops.h"
#include "mpegutils.h" #include "mpegutils.h"
#include "unary.h" #include "unary.h"
#include "rv10.h" #include "rv10dec.h"
#include "mpeg4video.h" #include "mpeg4video.h"
#include "mpegvideodata.h" #include "mpegvideodata.h"
#include "mpeg4videodec.h" #include "mpeg4videodec.h"

@ -70,7 +70,7 @@
#include "internal.h" #include "internal.h"
#include "bytestream.h" #include "bytestream.h"
#include "wmv2enc.h" #include "wmv2enc.h"
#include "rv10.h" #include "rv10enc.h"
#include "packet_internal.h" #include "packet_internal.h"
#include <limits.h> #include <limits.h>
#include "sp5x.h" #include "sp5x.h"

@ -41,7 +41,7 @@
#include "mpegvideo.h" #include "mpegvideo.h"
#include "mpeg4video.h" #include "mpeg4video.h"
#include "mpegvideodata.h" #include "mpegvideodata.h"
#include "rv10.h" #include "rv10dec.h"
#define RV_GET_MAJOR_VER(x) ((x) >> 28) #define RV_GET_MAJOR_VER(x) ((x) >> 28)
#define RV_GET_MINOR_VER(x) (((x) >> 20) & 0xFF) #define RV_GET_MINOR_VER(x) (((x) >> 20) & 0xFF)

@ -0,0 +1,28 @@
/*
* 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_RV10DEC_H
#define AVCODEC_RV10DEC_H
#include "mpegvideo.h"
int ff_rv_decode_dc(MpegEncContext *s, int n);
#endif /* AVCODEC_RV10DEC_H */

@ -27,7 +27,7 @@
#include "mpegvideo.h" #include "mpegvideo.h"
#include "put_bits.h" #include "put_bits.h"
#include "rv10.h" #include "rv10enc.h"
int ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number) int ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number)
{ {

@ -1,5 +1,5 @@
/* /*
* RV10/RV20 decoder * RV10/RV20 encoder
* *
* This file is part of FFmpeg. * This file is part of FFmpeg.
* *
@ -18,16 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef AVCODEC_RV10_H #ifndef AVCODEC_RV10ENC_H
#define AVCODEC_RV10_H #define AVCODEC_RV10ENC_H
#include <stdint.h>
#include "mpegvideo.h" #include "mpegvideo.h"
int ff_rv_decode_dc(MpegEncContext *s, int n);
int ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number); int ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number);
void ff_rv20_encode_picture_header(MpegEncContext *s, int picture_number); void ff_rv20_encode_picture_header(MpegEncContext *s, int picture_number);
#endif /* AVCODEC_RV10_H */ #endif /* AVCODEC_RV10ENC_H */

@ -30,7 +30,7 @@
#include "h263data.h" #include "h263data.h"
#include "h263enc.h" #include "h263enc.h"
#include "put_bits.h" #include "put_bits.h"
#include "rv10.h" #include "rv10enc.h"
void ff_rv20_encode_picture_header(MpegEncContext *s, int picture_number){ void ff_rv20_encode_picture_header(MpegEncContext *s, int picture_number){
put_bits(&s->pb, 2, s->pict_type); //I 0 vs. 1 ? put_bits(&s->pb, 2, s->pict_type); //I 0 vs. 1 ?

Loading…
Cancel
Save