videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-08-06 09:35:43 +02:00
Code Releases Activity

fix feed read_header, avoid using put_tag in write_header, to be consistent with read_header, also some minor cosmetics

Browse Source 
Originally committed as revision 4636 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Beregszaszi 2005-10-12 23:25:15 +00:00
parent e134e10f37
commit 26aa0f8956
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/ffm.c
View File

@ -132,7 +132,7 @@ static int ffm_write_header(AVFormatContext *s)
ffm->packet_size = FFM_PACKET_SIZE; ffm->packet_size = FFM_PACKET_SIZE;
/* header */ /* header */
put_tag(pb, "FFM1"); put_le32(pb, MKTAG('F', 'F', 'M', '1'));
put_be32(pb, ffm->packet_size); put_be32(pb, ffm->packet_size);
/* XXX: store write position in other file ? */ /* XXX: store write position in other file ? */
put_be64(pb, ffm->packet_size); /* current write position */ put_be64(pb, ffm->packet_size); /* current write position */
@ -480,6 +480,7 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap)
fst = av_mallocz(sizeof(FFMStream)); fst = av_mallocz(sizeof(FFMStream));
if (!fst) if (!fst)
goto fail; goto fail;
s->streams[i] = st;
av_set_pts_info(st, 64, 1, 1000000); av_set_pts_info(st, 64, 1, 1000000);
@ -487,10 +488,10 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap)
codec = st->codec; codec = st->codec;
/* generic info */ /* generic info */
st->codec->codec_id = get_be32(pb); codec->codec_id = get_be32(pb);
st->codec->codec_type = get_byte(pb); /* codec_type */ codec->codec_type = get_byte(pb); /* codec_type */
codec->bit_rate = get_be32(pb); codec->bit_rate = get_be32(pb);
st->quality = get_be32(pb); st->quality = get_be32(pb);
codec->flags = get_be32(pb); codec->flags = get_be32(pb);
codec->flags2 = get_be32(pb); codec->flags2 = get_be32(pb);
codec->debug = get_be32(pb); codec->debug = get_be32(pb);