Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Sun, 8 Apr 2018 15:54:07 +0000 (17:54 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Sun, 8 Apr 2018 15:54:07 +0000 (17:54 +0200)
source/blender/makesrna/intern/rna_scene.c

index 2594eb654e8d00728f5a1af672821c651fd1e123..f888d198e24c32e37f6567e1f27d4d8f6f8b8e0a 100644 (file)
@@ -5231,18 +5231,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}
        };
 
@@ -5274,13 +5274,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