"Render Audio" cleanup:

* Removed audio-only options from ffmpeg render settings (added some versionning code too)!
* Moved the Mixdon button from the Scene->Audio pannel to the Render->Render panel.

1 files changed, 0 insertions, 16 deletions

diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index 5507baecd76..bcf5e712eff 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -298,16 +298,6 @@ static const char **get_file_extensions(int format)
 			static const char *rv[] = { ".ogv", ".ogg", NULL };
 			return rv;
 		}
-		case FFMPEG_MP3:
-		{
-			static const char *rv[] = { ".mp3", NULL };
-			return rv;
-		}
-		case FFMPEG_WAV:
-		{
-			static const char *rv[] = { ".wav", NULL };
-			return rv;
-		}
 		default:
 			return NULL;
 	}
@@ -875,12 +865,6 @@ static int start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty, Report
 		case FFMPEG_FLV:
 			fmt->video_codec = CODEC_ID_FLV1;
 			break;
-		case FFMPEG_MP3:
-			fmt->audio_codec = CODEC_ID_MP3;
-			/* fall-through */
-		case FFMPEG_WAV:
-			fmt->video_codec = CODEC_ID_NONE;
-			break;
 		case FFMPEG_MPEG4:
 		default:
 			fmt->video_codec = CODEC_ID_MPEG4;