diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-23 23:04:06 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-23 23:25:09 +0400 |
commit | 2cb4d516549526b5e17e941f6d2375a2c501ade6 (patch) | |
tree | f472c62e0b34c2faaa955d51874cddb6be759910 /libavformat/flvenc.c | |
parent | 7e15df7551cf45ad1d3e39d20fdc8d6c651d4705 (diff) | |
parent | d04c5293ce88927ad359ca276e287bfa63c2329d (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
v410dec: Implement explode mode support
zerocodec: fix direct rendering.
wav: init st to NULL to avoid a false-positive warning.
wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit
h264: refactor NAL decode loop
RTMPTE protocol support
RTMPE protocol support
rtmp: Add ff_rtmp_calc_digest_pos()
rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global
swscale: add missing HAVE_INLINE_ASM check.
lavfi: place x86 inline assembly under HAVE_INLINE_ASM.
vc1: Add a test for interlaced field pictures
swscale: Mark all init functions as av_cold
swscale: x86: Drop pointless _mmx suffix from filenames
lavf: use conditional notation for default codec in muxer declarations.
swscale: place inline assembly bilinear scaler under HAVE_INLINE_ASM.
dsputil: ppc: cosmetics: pretty-print
dsputil: x86: add SHUFFLE_MASK_W macro
configure: respect CC_O setting in check_cc
Conflicts:
Changelog
configure
libavcodec/v410dec.c
libavcodec/zerocodec.c
libavformat/asfenc.c
libavformat/version.h
libswscale/utils.c
libswscale/x86/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flvenc.c')
-rw-r--r-- | libavformat/flvenc.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index f6933a7b35..610c3fc720 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -570,11 +570,7 @@ AVOutputFormat ff_flv_muxer = { .mime_type = "video/x-flv", .extensions = "flv", .priv_data_size = sizeof(FLVContext), -#if CONFIG_LIBMP3LAME - .audio_codec = CODEC_ID_MP3, -#else // CONFIG_LIBMP3LAME - .audio_codec = CODEC_ID_ADPCM_SWF, -#endif // CONFIG_LIBMP3LAME + .audio_codec = CONFIG_LIBMP3LAME ? CODEC_ID_MP3 : CODEC_ID_ADPCM_SWF, .video_codec = CODEC_ID_FLV1, .write_header = flv_write_header, .write_packet = flv_write_packet, |