Commit 8c0c1122 authored by Benjamin Larsson's avatar Benjamin Larsson

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

streaming to ffserver work again.

Originally committed as revision 20869 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 8b484d0f
...@@ -354,6 +354,7 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -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;
......
...@@ -172,6 +172,7 @@ static int ffm_write_header(AVFormatContext *s) ...@@ -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;
......
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