Commit ee050aed authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Qt4: fix transcode/stream character encoding - fixes #2411

(cherry picked from commit 81dc2e72)

Conflicts:

	modules/gui/qt4/dialogs/sout.cpp
parent 421dabb3
...@@ -459,7 +459,7 @@ void SoutDialog::updateMRL() ...@@ -459,7 +459,7 @@ void SoutDialog::updateMRL()
{ {
mrl = ":sout=#transcode{"; mrl = ":sout=#transcode{";
mrl.append( "vcodec=" ); mrl.append( "vcodec=" );
mrl.append( sout.psz_vcodec ); mrl.append( qfu( sout.psz_vcodec ) );
mrl.append( "," ); mrl.append( "," );
mrl.append( "vb=" ); mrl.append( "vb=" );
mrl.append( QString::number( sout.i_vb,10 ) ); mrl.append( QString::number( sout.i_vb,10 ) );
...@@ -480,7 +480,7 @@ void SoutDialog::updateMRL() ...@@ -480,7 +480,7 @@ void SoutDialog::updateMRL()
mrl = ":sout=#transcode{"; mrl = ":sout=#transcode{";
} }
mrl.append( "acodec=" ); mrl.append( "acodec=" );
mrl.append( sout.psz_acodec ); mrl.append( qfu( sout.psz_acodec ) );
mrl.append( "," ); mrl.append( "," );
mrl.append( "ab=" ); mrl.append( "ab=" );
mrl.append( QString::number( sout.i_ab,10 ) ); mrl.append( QString::number( sout.i_ab,10 ) );
...@@ -496,7 +496,7 @@ void SoutDialog::updateMRL() ...@@ -496,7 +496,7 @@ void SoutDialog::updateMRL()
if ( sout.b_file && sout.b_dump ) if ( sout.b_file && sout.b_dump )
{ {
mrl = ":demux=dump :demuxdump-file="; mrl = ":demux=dump :demuxdump-file=";
mrl.append( sout.psz_file ); mrl.append( qfu( sout.psz_file ) );
} }
else else
...@@ -539,7 +539,7 @@ void SoutDialog::updateMRL() ...@@ -539,7 +539,7 @@ void SoutDialog::updateMRL()
mrl.append( "std{access=file" ); mrl.append( "std{access=file" );
CHECKMUX(); CHECKMUX();
mrl.append( ",dst=" ); mrl.append( ",dst=" );
mrl.append( sout.psz_file ); mrl.append( qfu( sout.psz_file ) );
mrl.append( "}" ); mrl.append( "}" );
more = true; more = true;
} }
...@@ -551,7 +551,7 @@ void SoutDialog::updateMRL() ...@@ -551,7 +551,7 @@ void SoutDialog::updateMRL()
mrl.append( "std{access=http" ); mrl.append( "std{access=http" );
CHECKMUX(); CHECKMUX();
mrl.append( ",dst=" ); mrl.append( ",dst=" );
mrl.append( sout.psz_http ); mrl.append( qfu( sout.psz_http ) );
mrl.append( ":" ); mrl.append( ":" );
mrl.append( QString::number( sout.i_http,10 ) ); mrl.append( QString::number( sout.i_http,10 ) );
mrl.append( "}" ); mrl.append( "}" );
...@@ -565,7 +565,7 @@ void SoutDialog::updateMRL() ...@@ -565,7 +565,7 @@ void SoutDialog::updateMRL()
mrl.append( "std{access=mmsh" ); mrl.append( "std{access=mmsh" );
CHECKMUX(); CHECKMUX();
mrl.append( ",dst=" ); mrl.append( ",dst=" );
mrl.append( sout.psz_mms ); mrl.append( qfu( sout.psz_mms ) );
mrl.append( ":" ); mrl.append( ":" );
mrl.append( QString::number( sout.i_mms,10 ) ); mrl.append( QString::number( sout.i_mms,10 ) );
mrl.append( "}" ); mrl.append( "}" );
...@@ -581,7 +581,7 @@ void SoutDialog::updateMRL() ...@@ -581,7 +581,7 @@ void SoutDialog::updateMRL()
mrl.append( "std{access=udp" ); mrl.append( "std{access=udp" );
CHECKMUX(); CHECKMUX();
mrl.append( ",dst=" ); mrl.append( ",dst=" );
mrl.append( sout.psz_udp ); mrl.append( qfu( sout.psz_udp ) );
mrl.append( ":" ); mrl.append( ":" );
mrl.append( QString::number( sout.i_udp,10 ) ); mrl.append( QString::number( sout.i_udp,10 ) );
} }
...@@ -589,7 +589,7 @@ void SoutDialog::updateMRL() ...@@ -589,7 +589,7 @@ void SoutDialog::updateMRL()
{ {
mrl.append( "rtp{" ); mrl.append( "rtp{" );
mrl.append( "dst=" ); mrl.append( "dst=" );
mrl.append( sout.psz_rtp ); mrl.append( qfu( sout.psz_rtp ) );
CHECKMUX(); CHECKMUX();
mrl.append( ",port=" ); mrl.append( ",port=" );
mrl.append( QString::number( sout.i_rtp,10 ) ); mrl.append( QString::number( sout.i_rtp,10 ) );
...@@ -607,10 +607,10 @@ void SoutDialog::updateMRL() ...@@ -607,10 +607,10 @@ void SoutDialog::updateMRL()
{ {
mrl.append( ",sap," ); mrl.append( ",sap," );
mrl.append( "group=\"" ); mrl.append( "group=\"" );
mrl.append( sout.psz_group ); mrl.append( qfu( sout.psz_group ) );
mrl.append( "\"," ); mrl.append( "\"," );
mrl.append( "name=\"" ); mrl.append( "name=\"" );
mrl.append( sout.psz_name ); mrl.append( qfu( sout.psz_name ) );
mrl.append( "\"" ); mrl.append( "\"" );
} }
...@@ -624,13 +624,13 @@ void SoutDialog::updateMRL() ...@@ -624,13 +624,13 @@ void SoutDialog::updateMRL()
ATLEASTONE(); ATLEASTONE();
mrl.append( "std{access=shout,mux=ogg" ); mrl.append( "std{access=shout,mux=ogg" );
mrl.append( ",dst=" ); mrl.append( ",dst=" );
mrl.append( sout.sa_icecast.psz_username ); mrl.append( qfu( sout.sa_icecast.psz_username ) );
mrl.append( "@" ); mrl.append( "@" );
mrl.append( sout.psz_icecast ); mrl.append( qfu( sout.psz_icecast ) );
mrl.append( ":" ); mrl.append( ":" );
mrl.append( QString::number( sout.i_icecast, 10 ) ); mrl.append( QString::number( sout.i_icecast, 10 ) );
mrl.append( "/" ); mrl.append( "/" );
mrl.append( sout.psz_icecast_mountpoint ); mrl.append( qfu( sout.psz_icecast_mountpoint ) );
mrl.append( "}" ); mrl.append( "}" );
more = true; more = true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment