# HG changeset patch # User banan # Date 1260824901 0 # Node ID 08abadf5350b9bc5fab741060352495aeaabf7a5 # Parent 60e08f8038bdf22c7e70bcef0fd84f0074423ac1 Fix breakage introduced by setting the sample_fmt to SAMPLE_FMT_NONE (r20623). This makes streaming to ffserver work again. diff -r 60e08f8038bd -r 08abadf5350b ffmdec.c --- a/ffmdec.c Mon Dec 14 15:59:19 2009 +0000 +++ b/ffmdec.c Mon Dec 14 21:08:21 2009 +0000 @@ -354,6 +354,7 @@ 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 -r 60e08f8038bd -r 08abadf5350b ffmenc.c --- a/ffmenc.c Mon Dec 14 15:59:19 2009 +0000 +++ b/ffmenc.c Mon Dec 14 21:08:21 2009 +0000 @@ -172,6 +172,7 @@ 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;