[vlc-commits] Qt: use mux=flac for encoding extension

[Jean-Baptiste Kempf]

vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Aug 21 00:19:21 2013 +0200| [b3b49086bb7e3a0116d37c15564e3d64acd8dddd] | committer: Jean-Baptiste Kempf

Qt: use mux=flac for encoding extension

Same issue as mp3 .raw extensions

(cherry picked from commit e749dd59bf195ba6b058cb233e016eff349e610e)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

Conflicts:
	modules/gui/qt4/components/sout/profiles.hpp

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=b3b49086bb7e3a0116d37c15564e3d64acd8dddd
---

 modules/gui/qt4/components/sout/profiles.hpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gui/qt4/components/sout/profiles.hpp b/modules/gui/qt4/components/sout/profiles.hpp
index 13830f6..449e34f 100644
--- a/modules/gui/qt4/components/sout/profiles.hpp
+++ b/modules/gui/qt4/components/sout/profiles.hpp
@@ -41,7 +41,7 @@ static const char * video_profile_value_list[] = {
     "audio_enable=yes;audio_codec=vorb;acodec_bitrate=128;acodec_channels=2;acodec_samplerate=44100;muxer_mux=ogg",
     "audio_enable=yes;audio_codec=mp3;acodec_bitrate=128;acodec_channels=2;acodec_samplerate=44100;muxer_mux=mp3",
     "audio_enable=yes;audio_codec=mpga;acodec_bitrate=128;acodec_channels=2;acodec_samplerate=44100;muxer_mux=mp4",
-    "audio_enable=yes;audio_codec=flac;acodec_bitrate=128;acodec_channels=2;acodec_samplerate=44100;muxer_mux=raw",
+    "audio_enable=yes;audio_codec=flac;acodec_bitrate=128;acodec_channels=2;acodec_samplerate=44100;muxer_mux=flac",
     "audio_enable=yes;audio_codec=s16l;acodec_bitrate=128;acodec_channels=2;acodec_samplerate=44100;muxer_mux=wav",
     "audio_enable=yes;audio_codec=mp3;acodec_bitrate=192;acodec_channels=2;acodec_samplerate=44100;video_enable=yes;video_codec=h264;vcodec_bitrate=1500;vcodec_qp=0;vcodec_framerate=0;vcodec_width=1280;vcodec_height=720;muxer_mux=mp4",
     "audio_enable=yes;audio_codec=mp3;acodec_bitrate=192;acodec_channels=2;acodec_samplerate=44100;video_enable=yes;video_codec=h264;vcodec_bitrate=3500;vcodec_qp=0;vcodec_framerate=0;vcodec_width=1920;vcodec_height=1080;muxer_mux=mp4",