diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-10 16:19:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-10 16:25:23 +0200 |
| commit | 18b0c39f99eee508107c47345494e535b8757434 (patch) | |
| tree | b1418e52aab2f1fb8a171c3bb3fada3c7b0df531 /libavformat/swfdec.c | |
| parent | d9d0c1ccc3df39fecbbbb6b600c18542741c5a51 (diff) | |
| parent | 05c36e0e5fbf0b75dbbbd327ad2f6a62992f9262 (diff) | |
| download | ffmpeg-18b0c39f99eee508107c47345494e535b8757434.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
g723.1: fix addition overflow
g723.1: simplify and fix multiplication overflow
g723.1: deobfuscate an expression
g723.1: remove unused #includes
ARM: add missing "cc" clobber in av_clipl_int32_arm()
rtmp: Factorize the code by adding handle_invoke_error
rtmp: Factorize the code by adding handle_invoke_status
rtmp: Factorize the code by adding handle_invoke_result
libavutil: remove unused av_abort() macro
ffmenc: replace if/abort with assert()
libavutil: drop offsetof() fallback definition
libavutil: drop fallback definitions of INTxx_MIN/MAX
configure: Check for a sctp struct instead of just the header
configure: suncc: Add -xc99 to dependency flags, required on Solaris
doxygen: Fix function parameter names to match the code
doc: Drop obsolete shared libs cflags hint to workaround Cygwin gcc bugs
swf: Move shared table out of the header file
swf: Move swf_audio_codec_tags table to the only place it is used
fate: add G.723.1 decoder tests
Conflicts:
configure
doc/platform.texi
libavformat/Makefile
libavutil/arm/intmath.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/swfdec.c')
| -rw-r--r-- | libavformat/swfdec.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c index 1e974fef69..069457f9fd 100644 --- a/libavformat/swfdec.c +++ b/libavformat/swfdec.c @@ -23,6 +23,15 @@ #include "libavutil/intreadwrite.h" #include "swf.h" +static const AVCodecTag swf_audio_codec_tags[] = { + { CODEC_ID_PCM_S16LE, 0x00 }, + { CODEC_ID_ADPCM_SWF, 0x01 }, + { CODEC_ID_MP3, 0x02 }, + { CODEC_ID_PCM_S16LE, 0x03 }, +// { CODEC_ID_NELLYMOSER, 0x06 }, + { CODEC_ID_NONE, 0 }, +}; + static int get_swf_tag(AVIOContext *pb, int *len_ptr) { int tag, len; @@ -164,7 +173,7 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt) return -1; vst->id = ch_id; vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; - vst->codec->codec_id = ff_codec_get_id(swf_codec_tags, avio_r8(pb)); + vst->codec->codec_id = ff_codec_get_id(ff_swf_codec_tags, avio_r8(pb)); avpriv_set_pts_info(vst, 16, 256, swf->frame_rate); len -= 8; } else if (tag == TAG_STREAMHEAD || tag == TAG_STREAMHEAD2) { |