Merge commit 'e7af52a68dde9144b273a9598b60bf0f56e1323b'

* commit 'e7af52a68dde9144b273a9598b60bf0f56e1323b':
  mpegvideo: rv10: Move function declaration to a separate header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-06-12 21:05:09 +02:00
commit b5c71fba59
7 changed files with 38 additions and 5 deletions

View File

@ -42,6 +42,7 @@
#include "mpegutils.h"
#include "unary.h"
#include "flv.h"
#include "rv10.h"
#include "mpeg4video.h"
#include "mpegvideodata.h"

View File

@ -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 */

View File

@ -59,6 +59,7 @@
#include "internal.h"
#include "bytestream.h"
#include "wmv2.h"
#include "rv10.h"
#include <limits.h>
#include "sp5x.h"

View File

@ -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)

33
libavcodec/rv10.h Normal file
View File

@ -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 */

View File

@ -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)
{

View File

@ -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 ?