virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

rv10 cleanup (de)muxer still needs to be cleaned up (still searching volunteer for that ;) )

Browse Source 
Originally committed as revision 988 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2002-10-01 19:29:10 +00:00
parent e41e834272
commit 144f062500
3 changed files with 86 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libav/rm.c
View File

@@ -591,12 +591,9 @@ static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap)
h263_hack_version = get_be32(pb);
switch(h263_hack_version) {
case 0x10000000:
st->codec.sub_id = 0;
st->codec.codec_id = CODEC_ID_RV10;
break;
case 0x10003000:
case 0x10003001:
st->codec.sub_id = 3;
st->codec.sub_id = h263_hack_version;
st->codec.codec_id = CODEC_ID_RV10;
break;
default:
@@ -681,7 +678,6 @@ static int rm_read_packet(AVFormatContext *s, AVPacket *pkt)
goto redo;
}
#if 0 // XXX/FIXME this is done in the codec currently, but should be done here ...
if (st->codec.codec_type == CODEC_TYPE_VIDEO) {
int full_frame, h, pic_num;
@@ -705,15 +701,11 @@ static int rm_read_packet(AVFormatContext *s, AVPacket *pkt)
/* picture number */
pic_num= get_byte(pb);
av_new_packet(pkt, len+1);
pkt->stream_index = i;
//XXX/FIXME: is this a good idea?
pkt->data[0]= h; //store header, its needed for decoding
get_buffer(pb, pkt->data+1, len);
//XXX/FIXME/HACK, demuxer should be fixed to send complete frames ...
if(st->codec.slice_offset==NULL) st->codec.slice_offset= (int*)malloc(sizeof(int));
st->codec.slice_count= full_frame;
st->codec.slice_offset[0]= 0;
}
#endif
av_new_packet(pkt, len);
pkt->stream_index = i;