diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-07-21 16:44:26 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2012-07-22 16:10:21 -0700 |
| commit | fd4872184945ff4275f04f7b95ee7aba49407f3c (patch) | |
| tree | b94c5a725b61b55a5951a1d0c7b59b45b088fe9f /libavformat/flvenc.c | |
| parent | a6e922ffa2fdcc467d07fd6454a4557625c750ad (diff) | |
| download | ffmpeg-fd4872184945ff4275f04f7b95ee7aba49407f3c.tar.gz | |
lavf: use conditional notation for default codec in muxer declarations.
This removes the use of macro nesting in these code constructs, which
makes it easier to parse in pre-processors.
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 d77507dd62..ce1a4e45cc 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -546,11 +546,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, |