aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2004-12-07 13:14:37 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-12-07 13:14:37 +0000
commitd0271e8a3aa6eff7640e5fb59ad56671d50142a5 (patch)
treeac5dcfd1581ed13051c0dc329296dac2c83be497 /libavformat
parent37e85dacd06cee7ae27cc500942022e820a50593 (diff)
downloadffmpeg-d0271e8a3aa6eff7640e5fb59ad56671d50142a5.tar.gz
rv20 encoding
Originally committed as revision 3739 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/rm.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/libavformat/rm.c b/libavformat/rm.c
index d0be6400f1..f08a658219 100644
--- a/libavformat/rm.c
+++ b/libavformat/rm.c
@@ -230,7 +230,10 @@ static void rv10_write_header(AVFormatContext *ctx,
} else {
/* video codec info */
put_be32(s,34); /* size */
- put_tag(s,"VIDORV10");
+ if(stream->enc->codec_id == CODEC_ID_RV10)
+ put_tag(s,"VIDORV10");
+ else
+ put_tag(s,"VIDORV20");
put_be16(s, stream->enc->width);
put_be16(s, stream->enc->height);
put_be16(s, (int) stream->frame_rate); /* frames per seconds ? */
@@ -241,7 +244,10 @@ static void rv10_write_header(AVFormatContext *ctx,
/* Seems to be the codec version: only use basic H263. The next
versions seems to add a diffential DC coding as in
MPEG... nothing new under the sun */
- put_be32(s,0x10000000);
+ if(stream->enc->codec_id == CODEC_ID_RV10)
+ put_be32(s,0x10000000);
+ else
+ put_be32(s,0x20103001);
//put_be32(s,0x10003000);
}
}