← Back to branch summary

~ubuntu-branches/ubuntu/vivid/gnash/vivid

« back to all changes in this revision

Viewing changes to libmedia/gst/MediaHandlerGst.cpp

  • Committer: Package Import Robot
  • Author(s): Dimitri John Ledkov
  • Date: 2014-06-20 11:25:58 UTC
  • mfrom: (1.1.21) (3.1.34 sid)
  • Revision ID: package-import@ubuntu.com-20140620112558-rge2xst0g7a6e11i
Tags: 0.8.11~git20140419-1ubuntu1
* Sync from Debian, with a following modification:
* Build-depend on firefox-dev, instead of xulrunner-dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libmedia/gst/MediaHandlerGst.cpp
86
86
 
87
87
        ExtraInfoGst* extrainfo = dynamic_cast<ExtraInfoGst*>(info.extra.get());
88
88
 
89
 
        if (!extrainfo) {
 
89
        if (!extrainfo) {
90
90
            log_error(_("Wrong arguments given to GST VideoDecoder"));
91
91
            return std::auto_ptr<VideoDecoder>();
92
92
        }
93
93
        return std::auto_ptr<VideoDecoder>(
94
 
                        new VideoDecoderGst(extrainfo->caps));
 
94
            new VideoDecoderGst(extrainfo->caps));
95
95
    }
96
96
    videoCodecType format = static_cast<videoCodecType>(info.codec);
97
97
    int width = info.width;
103
103
    ExtraVideoInfoFlv* extrainfo = dynamic_cast<ExtraVideoInfoFlv*>(info.extra.get());
104
104
    if (extrainfo) {
105
105
        extradata = extrainfo->data.get();
106
 
                datasize = extrainfo->size;
 
106
        datasize = extrainfo->size;
107
107
    }
108
108
 
109
109
    std::auto_ptr<VideoDecoder> ret( new VideoDecoderGst(format, width, height, extradata, datasize) );