diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-09-30 21:36:43 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-09-30 21:36:43 +0000 |
| commit | 4c2bc159bd56a0e8b387a302f2873271224669fd (patch) | |
| tree | f70e32bfa8b474ecaa2e6189f81897fa2253610b /libavcodec/rv10.c | |
| parent | a02017367b4a733b7ac208ebc7d46ef6db9947ed (diff) | |
| download | ffmpeg-4c2bc159bd56a0e8b387a302f2873271224669fd.tar.gz | |
fixing rv10, this isnt the cleanest solution (parsing the packet header in the codec & creating it in the muxer) but it was that way before things broke, and its the simplest solution
Originally committed as revision 986 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/rv10.c')
| -rw-r--r-- | libavcodec/rv10.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 72a412eb5e..c357d55644 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -223,18 +223,10 @@ int rv_decode_dc(MpegEncContext *s, int n) /* write RV 1.0 compatible frame header */ void rv10_encode_picture_header(MpegEncContext *s, int picture_number) { - int full_frame= 1; + int full_frame= 0; align_put_bits(&s->pb); - if(full_frame){ - put_bits(&s->pb, 8, 0xc0); /* packet header */ - put_bits(&s->pb, 16, 0x4000); /* len */ - put_bits(&s->pb, 16, 0x4000); /* pos */ - } - - put_bits(&s->pb, 8, picture_number&0xFF); - put_bits(&s->pb, 1, 1); /* marker */ put_bits(&s->pb, 1, (s->pict_type == P_TYPE)); @@ -276,6 +268,7 @@ static int rv10_decode_picture_header(MpegEncContext *s) int mb_count, pb_frame, marker, h, full_frame; int pic_num, unk; + //XXX/FIXME this should be done in the demuxer not here /* skip packet header */ h = get_bits(&s->gb, 8); if ((h & 0xc0) == 0xc0) { |