summaryrefslogtreecommitdiff
path: root/libavcodec/rv10.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-08-03 23:07:08 +0000
committerDiego Biurrun <diego@biurrun.de>2009-08-03 23:07:08 +0000
commitb6767d6d9b826f5a578b764552c9eb5f5ff01527 (patch)
treef5c091c9f4f82aaf80b8a6e019ec41c541fc9c11 /libavcodec/rv10.c
parenteb98cdfa8da661837311e51f6038dd358cf1de65 (diff)
Split RV20 encoder into its own file.
Originally committed as revision 19578 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/rv10.c')
-rw-r--r--libavcodec/rv10.c45
1 files changed, 2 insertions, 43 deletions
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index a3f5e1c110..d6b62f7df8 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -230,7 +230,7 @@ int rv_decode_dc(MpegEncContext *s, int n)
}
-#if CONFIG_RV10_ENCODER || CONFIG_RV20_ENCODER
+#if CONFIG_RV10_ENCODER
/* write RV 1.0 compatible frame header */
void rv10_encode_picture_header(MpegEncContext *s, int picture_number)
{
@@ -259,36 +259,7 @@ void rv10_encode_picture_header(MpegEncContext *s, int picture_number)
put_bits(&s->pb, 3, 0); /* ignored */
}
-
-void 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, 1, 0); /* unknown bit */
- put_bits(&s->pb, 5, s->qscale);
-
- put_sbits(&s->pb, 8, picture_number); //FIXME wrong, but correct is not known
- s->mb_x= s->mb_y= 0;
- ff_h263_encode_mba(s);
-
- put_bits(&s->pb, 1, s->no_rounding);
-
- assert(s->f_code == 1);
- assert(s->unrestricted_mv == 1);
- assert(s->alt_inter_vlc == 0);
- assert(s->umvplus == 0);
- assert(s->modified_quant==1);
- assert(s->loop_filter==1);
-
- s->h263_aic= s->pict_type == FF_I_TYPE;
- if(s->h263_aic){
- s->y_dc_scale_table=
- s->c_dc_scale_table= ff_aic_dc_scale_table;
- }else{
- s->y_dc_scale_table=
- s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
- }
-}
-
-#endif /* CONFIG_RV10_ENCODER || CONFIG_RV20_ENCODER */
+#endif /* CONFIG_RV10_ENCODER */
/* read RV 1.0 compatible frame header */
static int rv10_decode_picture_header(MpegEncContext *s)
@@ -792,15 +763,3 @@ AVCodec rv10_encoder = {
.pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
.long_name= NULL_IF_CONFIG_SMALL("RealVideo 1.0"),
};
-
-AVCodec rv20_encoder = {
- "rv20",
- CODEC_TYPE_VIDEO,
- CODEC_ID_RV20,
- sizeof(MpegEncContext),
- MPV_encode_init,
- MPV_encode_picture,
- MPV_encode_end,
- .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
- .long_name= NULL_IF_CONFIG_SMALL("RealVideo 2.0"),
-};