highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix breakage introduced by setting the sample_fmt to SAMPLE_FMT_NONE (r20623). This makes

Browse Source 
streaming to ffserver work again.

Originally committed as revision 20869 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Benjamin Larsson 2009-12-14 21:08:21 +00:00
parent 8b484d0f07
commit 8c0c11229e
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/ffmdec.c
View File

@ -354,6 +354,7 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap)
codec->sample_rate = get_be32(pb); codec->sample_rate = get_be32(pb);
codec->channels = get_le16(pb); codec->channels = get_le16(pb);
codec->frame_size = get_le16(pb); codec->frame_size = get_le16(pb);
codec->sample_fmt = get_le16(pb);
break; break;
default: default:
goto fail; goto fail;

1
libavformat/ffmenc.c
View File

@ -172,6 +172,7 @@ static int ffm_write_header(AVFormatContext *s)
put_be32(pb, codec->sample_rate); put_be32(pb, codec->sample_rate);
put_le16(pb, codec->channels); put_le16(pb, codec->channels);
put_le16(pb, codec->frame_size); put_le16(pb, codec->frame_size);
put_le16(pb, codec->sample_fmt);
break; break;
default: default:
return -1; return -1;