Merge commit 'b9ba5253dd1232be4b48cfe61c31ff4b3de3d10a'

[ffmpeg] / libavformat / flic.c

diff --git a/libavformat/flic.c b/libavformat/flic.c
index 2b9ee67d460ef7d4a5417d36e84ec8f371553a54..8d49116acf966ed27f6f231fb5d300973c6e00cc 100644 (file)
--- a/libavformat/flic.c
+++ b/libavformat/flic.c
@@ -158,7 +158,6 @@ static int flic_read_header(AVFormatContext *s)
         ast->codec->codec_tag = 0;
         ast->codec->sample_rate = FLIC_TFTD_SAMPLE_RATE;
         ast->codec->channels = 1;
-        ast->codec->sample_fmt = AV_SAMPLE_FMT_U8;
         ast->codec->bit_rate = st->codec->sample_rate * 8;
         ast->codec->bits_per_coded_sample = 8;
         ast->codec->channel_layout = AV_CH_LAYOUT_MONO;