apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-11-02 05:23:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

lavf: use conditional notation for default codec in muxer declarations.

Browse Source 
This removes the use of macro nesting in these code constructs, which
makes it easier to parse in pre-processors.
This commit is contained in:
Ronald S. Bultje
2012-07-21 16:44:26 -07:00
parent a6e922ffa2
commit fd48721849
6 changed files with 18 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/avienc.c
View File

@@ -645,11 +645,7 @@ AVOutputFormat ff_avi_muxer = {
.mime_type = "video/x-msvideo",
.extensions = "avi",
.priv_data_size = sizeof(AVIContext),
#if CONFIG_LIBMP3LAME_ENCODER
.audio_codec = CODEC_ID_MP3,
#else
.audio_codec = CODEC_ID_AC3,
#endif
.audio_codec = CONFIG_LIBMP3LAME ? CODEC_ID_MP3 : CODEC_ID_AC3,
.video_codec = CODEC_ID_MPEG4,
.write_header = avi_write_header,
.write_packet = avi_write_packet,