diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-09-12 11:10:33 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-09-12 11:10:33 +0000 |
| commit | 7866eeff46f3807696100d1061b6cd07af0dd9eb (patch) | |
| tree | 3f733fa6426785509343c6a5706a1096ba916946 /libav | |
| parent | 15415af4188f50a3225121c3400b5c05bcaaeda0 (diff) | |
| download | ffmpeg-7866eeff46f3807696100d1061b6cd07af0dd9eb.tar.gz | |
m4v input support
return the correct number of bytes consumed for decding h263 like formats (needed for reading raw streams) this could break some divx files with b frames, so please tell me ASAP if u notice any problems
Originally committed as revision 924 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libav')
| -rw-r--r-- | libav/raw.c | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/libav/raw.c b/libav/raw.c index 47efe1af06..6cfa268e13 100644 --- a/libav/raw.c +++ b/libav/raw.c @@ -81,13 +81,19 @@ static int raw_read_header(AVFormatContext *s, int raw_read_packet(AVFormatContext *s, AVPacket *pkt) { - int ret; + int ret, size; + AVStream *st = s->streams[0]; + + if(st->codec.codec_id == CODEC_ID_MPEG4) + size= 1024*1024; //cant handle partial frames + else + size= RAW_PACKET_SIZE; - if (av_new_packet(pkt, RAW_PACKET_SIZE) < 0) + if (av_new_packet(pkt, size) < 0) return -EIO; pkt->stream_index = 0; - ret = get_buffer(&s->pb, pkt->data, RAW_PACKET_SIZE); + ret = get_buffer(&s->pb, pkt->data, size); if (ret <= 0) { av_free_packet(pkt); return -EIO; @@ -132,7 +138,8 @@ static int video_read_header(AVFormatContext *s, st->codec.codec_type = CODEC_TYPE_VIDEO; st->codec.codec_id = s->iformat->value; /* for mjpeg, specify frame rate */ - if (st->codec.codec_id == CODEC_ID_MJPEG) { + /* for mpeg4 specify it too (most mpeg4 streams dont have the fixed_vop_rate set ...)*/ + if (st->codec.codec_id == CODEC_ID_MJPEG || st->codec.codec_id == CODEC_ID_MPEG4) { if (ap) { st->codec.frame_rate = ap->frame_rate; } else { @@ -233,6 +240,17 @@ AVOutputFormat h263_oformat = { raw_write_trailer, }; +AVInputFormat m4v_iformat = { + "m4v", + "raw MPEG4 video format", + 0, + mpegvideo_probe, + video_read_header, + raw_read_packet, + raw_read_close, + value: CODEC_ID_MPEG4, +}; + AVOutputFormat m4v_oformat = { "m4v", "raw MPEG4 video format", @@ -434,6 +452,7 @@ int raw_init(void) av_register_output_format(&h263_oformat); + av_register_input_format(&m4v_iformat); av_register_output_format(&m4v_oformat); av_register_input_format(&mpegvideo_iformat); |