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/asfenc.c | |
| parent | a6e922ffa2fdcc467d07fd6454a4557625c750ad (diff) | |
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/asfenc.c')
| -rw-r--r-- | libavformat/asfenc.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index e45232dea4..a8814eba53 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -884,11 +884,7 @@ AVOutputFormat ff_asf_muxer = { .mime_type = "video/x-ms-asf", .extensions = "asf,wmv,wma", .priv_data_size = sizeof(ASFContext), -#if CONFIG_LIBMP3LAME - .audio_codec = CODEC_ID_MP3, -#else - .audio_codec = CODEC_ID_MP2, -#endif + .audio_codec = CONFIG_LIBMP3LAME ? CODEC_ID_MP3 : CODEC_ID_MP2, .video_codec = CODEC_ID_MSMPEG4V3, .write_header = asf_write_header, .write_packet = asf_write_packet, @@ -907,11 +903,7 @@ AVOutputFormat ff_asf_stream_muxer = { .mime_type = "video/x-ms-asf", .extensions = "asf,wmv,wma", .priv_data_size = sizeof(ASFContext), -#if CONFIG_LIBMP3LAME - .audio_codec = CODEC_ID_MP3, -#else - .audio_codec = CODEC_ID_MP2, -#endif + .audio_codec = CONFIG_LIBMP3LAME ? CODEC_ID_MP3 : CODEC_ID_MP2, .video_codec = CODEC_ID_MSMPEG4V3, .write_header = asf_write_stream_header, .write_packet = asf_write_packet, |