virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

* cleanup statics & const

Browse Source 
* using frame_bits to store bits_per_sample
 (to be able to recontruct exactly wav header)

Originally committed as revision 1187 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Zdenek Kabelac
2002-11-11 09:09:06 +00:00
parent c18a2692d2
commit e8c0008912
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libav/wav.c
View File

@@ -19,7 +19,7 @@
#include "avformat.h" #include "avformat.h"
#include "avi.h" #include "avi.h"
CodecTag codec_wav_tags[] = { const CodecTag codec_wav_tags[] = {
{ CODEC_ID_MP2, 0x50 }, { CODEC_ID_MP2, 0x50 },
{ CODEC_ID_MP3LAME, 0x55 }, { CODEC_ID_MP3LAME, 0x55 },
{ CODEC_ID_AC3, 0x2000 }, { CODEC_ID_AC3, 0x2000 },
@@ -106,7 +106,7 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc)
void get_wav_header(ByteIOContext *pb, AVCodecContext *codec, void get_wav_header(ByteIOContext *pb, AVCodecContext *codec,
int has_extra_data) int has_extra_data)
{ {
int id, bps; int id;
id = get_le16(pb); id = get_le16(pb);
codec->codec_type = CODEC_TYPE_AUDIO; codec->codec_type = CODEC_TYPE_AUDIO;
@@ -116,8 +116,8 @@ void get_wav_header(ByteIOContext *pb, AVCodecContext *codec,
codec->sample_rate = get_le32(pb); codec->sample_rate = get_le32(pb);
codec->bit_rate = get_le32(pb) * 8; codec->bit_rate = get_le32(pb) * 8;
codec->block_align = get_le16(pb); codec->block_align = get_le16(pb);
bps = get_le16(pb); /* bits per sample */ codec->frame_bits = get_le16(pb); /* bits per sample */
codec->codec_id = wav_codec_get_id(id, bps); codec->codec_id = wav_codec_get_id(id, codec->frame_bits);
if (has_extra_data) { if (has_extra_data) {
codec->extradata_size = get_le16(pb); codec->extradata_size = get_le16(pb);
if (codec->extradata_size > 0) { if (codec->extradata_size > 0) {