diff options
| -rw-r--r-- | src/demuxers/demux_flv.c | 6 | ||||
| -rw-r--r-- | src/libffmpeg/audio_decoder.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/buffer.h | 3 |
3 files changed, 10 insertions, 3 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; diff --git a/src/libffmpeg/audio_decoder.c b/src/libffmpeg/audio_decoder.c index c0a4503e2..16d2bc234 100644 --- a/src/libffmpeg/audio_decoder.c +++ b/src/libffmpeg/audio_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_decoder.c,v 1.29 2006/10/13 21:41:30 dgp85 Exp $ + * $Id: audio_decoder.c,v 1.30 2006/12/15 11:31:29 klan Exp $ * * xine audio decoder plugin using ffmpeg * @@ -107,6 +107,7 @@ static const ff_codec_t ff_audio_lookup[] = { {BUF_AUDIO_TRUESPEECH, CODEC_ID_TRUESPEECH, "TrueSpeech (ffmpeg)"}, {BUF_AUDIO_TTA, CODEC_ID_TTA, "True Audio Lossless (ffmpeg)"}, {BUF_AUDIO_SMACKER, CODEC_ID_SMACKAUDIO, "Smacker (ffmpeg)"}, + {BUF_AUDIO_FLVADPCM, CODEC_ID_ADPCM_SWF, "Flash ADPCM (ffmpeg)"}, }; @@ -472,6 +473,7 @@ static uint32_t supported_audio_types[] = { BUF_AUDIO_TRUESPEECH, BUF_AUDIO_TTA, BUF_AUDIO_SMACKER, + BUF_AUDIO_FLVADPCM, 0 }; diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h index fa8d96388..cb6b6e4cb 100644 --- a/src/xine-engine/buffer.h +++ b/src/xine-engine/buffer.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: buffer.h,v 1.159 2006/11/14 14:11:59 dgp85 Exp $ + * $Id: buffer.h,v 1.160 2006/12/15 11:31:29 klan Exp $ * * * contents: @@ -255,6 +255,7 @@ extern "C" { #define BUF_AUDIO_TRUESPEECH 0x03390000 #define BUF_AUDIO_TTA 0x033A0000 #define BUF_AUDIO_SMACKER 0x033B0000 +#define BUF_AUDIO_FLVADPCM 0x033C0000 /* spu buffer types: */ |