Commit d42f74b8 authored by Mike Melanson's avatar Mike Melanson

send the chunk preamble bytes to the respective decoders; Id RoQ demuxer

now works correctly

Originally committed as revision 2303 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 2ecad8bd
...@@ -174,8 +174,6 @@ static int roq_read_header(AVFormatContext *s, ...@@ -174,8 +174,6 @@ static int roq_read_header(AVFormatContext *s,
st->codec.bits_per_sample; st->codec.bits_per_sample;
st->codec.block_align = st->codec.channels * st->codec.bits_per_sample; st->codec.block_align = st->codec.channels * st->codec.bits_per_sample;
} }
printf (" video is %d x %d, audio is %d channels\n",
roq->width, roq->height, roq->audio_channels);
return 0; return 0;
} }
...@@ -261,7 +259,8 @@ static int roq_read_packet(AVFormatContext *s, ...@@ -261,7 +259,8 @@ static int roq_read_packet(AVFormatContext *s,
roq->audio_frame_count += (chunk_size / roq->audio_channels); roq->audio_frame_count += (chunk_size / roq->audio_channels);
} }
ret = get_buffer(pb, pkt->data, chunk_size); ret = get_buffer(pb, pkt->data + RoQ_CHUNK_PREAMBLE_SIZE,
chunk_size);
if (ret != chunk_size) if (ret != chunk_size)
ret = -EIO; ret = -EIO;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment