Commit 2f5132e7 authored by Alex Beregszaszi's avatar Alex Beregszaszi

proper handling of samplesize

Originally committed as revision 3980 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 19fe8b41
...@@ -132,6 +132,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -132,6 +132,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
av_log(s, AV_LOG_INFO, "Unsupported audio codec (%x)\n", flags >> 4); av_log(s, AV_LOG_INFO, "Unsupported audio codec (%x)\n", flags >> 4);
st->codec.codec_tag= (flags >> 4); st->codec.codec_tag= (flags >> 4);
} }
st->codec.bits_per_sample = (flags & 2) ? 16 : 8;
} }
}else{ }else{
st->codec.codec_type = CODEC_TYPE_VIDEO; st->codec.codec_type = CODEC_TYPE_VIDEO;
......
...@@ -35,7 +35,7 @@ static void put_be24(ByteIOContext *pb, int value) ...@@ -35,7 +35,7 @@ static void put_be24(ByteIOContext *pb, int value)
} }
static int get_audio_flags(AVCodecContext *enc){ static int get_audio_flags(AVCodecContext *enc){
int flags = 0; int flags = (enc->bits_per_sample == 16) ? 0x2 : 0x0;
switch (enc->sample_rate) { switch (enc->sample_rate) {
case 44100: case 44100:
......
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