diff options
| author | Claudio Ciccani <klan@users.sourceforge.net> | 2006-12-15 11:31:28 +0000 |
|---|---|---|
| committer | Claudio Ciccani <klan@users.sourceforge.net> | 2006-12-15 11:31:28 +0000 |
| commit | 1f4418dd9bfbc4110cd761afb6b832f261acf516 (patch) | |
| tree | b4aacbc7f86bc7e5c3dc1712d826f06414aedcb9 /src/demuxers | |
| parent | d5030fca994e66508095b50b7d88237afe16d9ca (diff) | |
| download | xine-lib-1f4418dd9bfbc4110cd761afb6b832f261acf516.tar.gz xine-lib-1f4418dd9bfbc4110cd761afb6b832f261acf516.tar.bz2 | |
Added BUF_AUDIO_FLVADPCM (Flash ADPCM).
CVS patchset: 8418
CVS date: 2006/12/15 11:31:28
Diffstat (limited to 'src/demuxers')
| -rw-r--r-- | src/demuxers/demux_flv.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/demuxers/demux_flv.c b/src/demuxers/demux_flv.c index 290bd4ed9..64aa23b53 100644 --- a/src/demuxers/demux_flv.c +++ b/src/demuxers/demux_flv.c @@ -24,7 +24,7 @@ * For more information on the FLV file format, visit: * http://download.macromedia.com/pub/flash/flash_file_format_specification.pdf * - * $Id: demux_flv.c,v 1.11 2006/12/15 09:39:40 klan Exp $ + * $Id: demux_flv.c,v 1.12 2006/12/15 11:31:28 klan Exp $ */ #ifdef HAVE_CONFIG_H @@ -273,6 +273,7 @@ static void parse_flv_script(demux_flv_t *this, int size) { if (this->input->read(this->input, buf, size ) != size) { this->status = DEMUX_FINISHED; + free(buf); return; } @@ -323,6 +324,9 @@ static int read_flv_packet(demux_flv_t *this) { case FLV_SOUND_FORMAT_PCM_BE: buf_type = BUF_AUDIO_LPCM_BE; break; + case FLV_SOUND_FORMAT_ADPCM: + buf_type = BUF_AUDIO_FLVADPCM; + break; case FLV_SOUND_FORMAT_MP3: buf_type = BUF_AUDIO_MPEG; break; |