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/swf.h | |
| 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/swf.h')
| -rw-r--r-- | libavformat/swf.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/libavformat/swf.h b/libavformat/swf.h index 2f920f7dd3..3c0c6076f2 100644 --- a/libavformat/swf.h +++ b/libavformat/swf.h @@ -91,19 +91,6 @@ typedef struct { #endif } SWFContext; -static const AVCodecTag swf_codec_tags[] = { - { AV_CODEC_ID_FLV1, 0x02}, - { AV_CODEC_ID_VP6F, 0x04}, - { AV_CODEC_ID_NONE, 0}, -}; - -static const AVCodecTag swf_audio_codec_tags[] = { - { AV_CODEC_ID_PCM_S16LE, 0x00}, - { AV_CODEC_ID_ADPCM_SWF, 0x01}, - { AV_CODEC_ID_MP3, 0x02}, - { AV_CODEC_ID_PCM_S16LE, 0x03}, - //{ AV_CODEC_ID_NELLYMOSER, 0x06}, - { AV_CODEC_ID_NONE, 0}, -}; +extern const AVCodecTag ff_swf_codec_tags[]; #endif /* AVFORMAT_SWF_H */ |