diff options
| author | Benjamin Larsson <banan@ludd.ltu.se> | 2009-12-14 21:08:21 +0000 |
|---|---|---|
| committer | Benjamin Larsson <banan@ludd.ltu.se> | 2009-12-14 21:08:21 +0000 |
| commit | 8c0c11229ec33b687b3c321b5789fbe87781c091 (patch) | |
| tree | 43d45fbff63844b2ae73e12fc3c44fe2b1aa1954 | |
| parent | 8b484d0f07088904dddffc8c8a8ad134b5f52037 (diff) | |
| download | ffmpeg-8c0c11229ec33b687b3c321b5789fbe87781c091.tar.gz | |
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
| -rw-r--r-- | libavformat/ffmdec.c | 1 | ||||
| -rw-r--r-- | libavformat/ffmenc.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index d2f16336c2..09f5779f68 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -354,6 +354,7 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap) codec->sample_rate = get_be32(pb); codec->channels = get_le16(pb); codec->frame_size = get_le16(pb); + codec->sample_fmt = get_le16(pb); break; default: goto fail; diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c index eb97b8ba04..52d55d6936 100644 --- a/libavformat/ffmenc.c +++ b/libavformat/ffmenc.c @@ -172,6 +172,7 @@ static int ffm_write_header(AVFormatContext *s) put_be32(pb, codec->sample_rate); put_le16(pb, codec->channels); put_le16(pb, codec->frame_size); + put_le16(pb, codec->sample_fmt); break; default: return -1; |