summaryrefslogtreecommitdiff
path: root/libavcodec/rv10.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-08-03 23:22:46 +0000
committerDiego Biurrun <diego@biurrun.de>2009-08-03 23:22:46 +0000
commitd8c2f8f71f054d77f51564c216177338137c05dc (patch)
tree6ebfc7db15238dcce89cdf5f69e69907022f9a2d /libavcodec/rv10.c
parentb6767d6d9b826f5a578b764552c9eb5f5ff01527 (diff)
Split RV10 encoder off into its own file.
Originally committed as revision 19579 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/rv10.c')
-rw-r--r--libavcodec/rv10.c48
1 files changed, 2 insertions, 46 deletions
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index d6b62f7df8..d552bf9501 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -1,5 +1,5 @@
/*
- * RV10 codec
+ * RV10/RV20 decoder
* Copyright (c) 2000,2001 Fabrice Bellard
* Copyright (c) 2002-2004 Michael Niedermayer
*
@@ -22,7 +22,7 @@
/**
* @file libavcodec/rv10.c
- * RV10 codec.
+ * RV10/RV20 decoder
*/
#include "avcodec.h"
@@ -229,38 +229,6 @@ int rv_decode_dc(MpegEncContext *s, int n)
return -code;
}
-
-#if CONFIG_RV10_ENCODER
-/* write RV 1.0 compatible frame header */
-void rv10_encode_picture_header(MpegEncContext *s, int picture_number)
-{
- int full_frame= 0;
-
- align_put_bits(&s->pb);
-
- put_bits(&s->pb, 1, 1); /* marker */
-
- put_bits(&s->pb, 1, (s->pict_type == FF_P_TYPE));
-
- put_bits(&s->pb, 1, 0); /* not PB frame */
-
- put_bits(&s->pb, 5, s->qscale);
-
- if (s->pict_type == FF_I_TYPE) {
- /* specific MPEG like DC coding not used */
- }
- /* if multiple packets per frame are sent, the position at which
- to display the macroblocks is coded here */
- if(!full_frame){
- put_bits(&s->pb, 6, 0); /* mb_x */
- put_bits(&s->pb, 6, 0); /* mb_y */
- put_bits(&s->pb, 12, s->mb_width * s->mb_height);
- }
-
- put_bits(&s->pb, 3, 0); /* ignored */
-}
-#endif /* CONFIG_RV10_ENCODER */
-
/* read RV 1.0 compatible frame header */
static int rv10_decode_picture_header(MpegEncContext *s)
{
@@ -751,15 +719,3 @@ AVCodec rv20_decoder = {
.long_name = NULL_IF_CONFIG_SMALL("RealVideo 2.0"),
.pix_fmts= ff_pixfmt_list_420,
};
-
-AVCodec rv10_encoder = {
- "rv10",
- CODEC_TYPE_VIDEO,
- CODEC_ID_RV10,
- 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 1.0"),
-};