← Back to branch summary

~ubuntu-branches/ubuntu/precise/vlc/precise-proposed

« back to all changes in this revision

Viewing changes to modules/gui/qt4/components/open_panels.cpp

  • Committer: Package Import Robot
  • Author(s): Benjamin Drung
  • Date: 2011-12-31 13:42:26 UTC
  • mfrom: (3.5.31 sid)
  • Revision ID: package-import@ubuntu.com-20111231134226-nwo5aheq7d03wooa
http://bugs.debian.org/604687
http://bugs.debian.org/651662
* New upstream release (Closes: #604687).
* Drop backported patches and patches that were accepted by upstream.
* Refresh remaining patches.
* Add mailcap entry for Ogg Video (Closes: #651662).

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/gui/qt4/components/open_panels.cpp
1140
1140
    case V4L2_DEVICE:
1141
1141
        fileList << "v4l2://" + v4l2VideoDevice->text();
1142
1142
        mrl += " :input-slave=alsa://" + v4l2AudioDevice->text();
1143
 
        mrl += " :v4l2-standard=" + QString::number( v4l2StdBox->currentIndex() );
 
1143
        mrl += " :v4l2-standard=" + QString::number( v4l2StdBox->itemData(
 
1144
                                        v4l2StdBox->currentIndex() ).toInt() );
1144
1145
        break;
1145
1146
    case JACK_DEVICE:
1146
1147
        mrl = "jack://";