From d6a1a0ebb86c3e0ca14540f79fbf54e7429d28a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Sun, 8 Apr 2018 17:52:30 +0200 Subject: Alphabetically ordered audio and video codecs --- source/blender/makesrna/intern/rna_scene.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'source') diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 1dfa19fb65a..69eb4665452 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -5446,18 +5446,18 @@ static void rna_def_scene_ffmpeg_settings(BlenderRNA *brna) static const EnumPropertyItem ffmpeg_codec_items[] = { {AV_CODEC_ID_NONE, "NONE", 0, "No Video", "Disables video output, for audio-only renders"}, - {AV_CODEC_ID_MPEG1VIDEO, "MPEG1", 0, "MPEG-1", ""}, - {AV_CODEC_ID_MPEG2VIDEO, "MPEG2", 0, "MPEG-2", ""}, - {AV_CODEC_ID_MPEG4, "MPEG4", 0, "MPEG-4(divx)", ""}, - {AV_CODEC_ID_HUFFYUV, "HUFFYUV", 0, "HuffYUV", ""}, + {AV_CODEC_ID_DNXHD, "DNXHD", 0, "DNxHD", ""}, {AV_CODEC_ID_DVVIDEO, "DV", 0, "DV", ""}, - {AV_CODEC_ID_H264, "H264", 0, "H.264", ""}, - {AV_CODEC_ID_THEORA, "THEORA", 0, "Theora", ""}, - {AV_CODEC_ID_FLV1, "FLASH", 0, "Flash Video", ""}, {AV_CODEC_ID_FFV1, "FFV1", 0, "FFmpeg video codec #1", ""}, - {AV_CODEC_ID_QTRLE, "QTRLE", 0, "QT rle / QT Animation", ""}, - {AV_CODEC_ID_DNXHD, "DNXHD", 0, "DNxHD", ""}, + {AV_CODEC_ID_FLV1, "FLASH", 0, "Flash Video", ""}, + {AV_CODEC_ID_H264, "H264", 0, "H.264", ""}, + {AV_CODEC_ID_HUFFYUV, "HUFFYUV", 0, "HuffYUV", ""}, + {AV_CODEC_ID_MPEG1VIDEO, "MPEG1", 0, "MPEG-1", ""}, + {AV_CODEC_ID_MPEG2VIDEO, "MPEG2", 0, "MPEG-2", ""}, + {AV_CODEC_ID_MPEG4, "MPEG4", 0, "MPEG-4 (divx)", ""}, {AV_CODEC_ID_PNG, "PNG", 0, "PNG", ""}, + {AV_CODEC_ID_QTRLE, "QTRLE", 0, "QT rle / QT Animation", ""}, + {AV_CODEC_ID_THEORA, "THEORA", 0, "Theora", ""}, {0, NULL, 0, NULL, NULL} }; @@ -5489,13 +5489,13 @@ static void rna_def_scene_ffmpeg_settings(BlenderRNA *brna) static const EnumPropertyItem ffmpeg_audio_codec_items[] = { {AV_CODEC_ID_NONE, "NONE", 0, "No Audio", "Disables audio output, for video-only renders"}, - {AV_CODEC_ID_MP2, "MP2", 0, "MP2", ""}, - {AV_CODEC_ID_MP3, "MP3", 0, "MP3", ""}, - {AV_CODEC_ID_AC3, "AC3", 0, "AC3", ""}, {AV_CODEC_ID_AAC, "AAC", 0, "AAC", ""}, - {AV_CODEC_ID_VORBIS, "VORBIS", 0, "Vorbis", ""}, + {AV_CODEC_ID_AC3, "AC3", 0, "AC3", ""}, {AV_CODEC_ID_FLAC, "FLAC", 0, "FLAC", ""}, + {AV_CODEC_ID_MP2, "MP2", 0, "MP2", ""}, + {AV_CODEC_ID_MP3, "MP3", 0, "MP3", ""}, {AV_CODEC_ID_PCM_S16LE, "PCM", 0, "PCM", ""}, + {AV_CODEC_ID_VORBIS, "VORBIS", 0, "Vorbis", ""}, {0, NULL, 0, NULL, NULL} }; #endif -- cgit v1.2.3