~ubuntu-branches/ubuntu/quantal/rhythmbox/quantal-proposed

« back to all changes in this revision

Viewing changes to shell/rb-track-transfer-queue.c

  • Committer: Package Import Robot
  • Author(s): Rico Tzschichholz
  • Date: 2011-09-09 14:13:24 UTC
  • mfrom: (1.1.59 upstream)
  • Revision ID: package-import@ubuntu.com-20110909141324-72ef36aetwiidw8e
Tags: 2.90.1~20110908-0ubuntu1
* New upstream git snapshot up to commit
  31e8e0e6b3a4af101f60b5733e0cfdd736f3dd6d
* reverted commit "visualizer: add colorspace converter so it works 
  with playbin2" (d9fe72447999c2777ddc053dfa28ff363e84336d) and 
  "visualizer: new clutter-based visualizer plugin"
  (082eaf958b60e3830f1607114353d777c930d616) to prevent dependency on
  clutter-gst which is in universe

Show diffs side-by-side

added added

removed removed

Lines of Context:
336
336
                        GstEncodingProfile *profile = GST_ENCODING_PROFILE (l->data);
337
337
                        char *profile_media_type;
338
338
                        profile_media_type = rb_gst_encoding_profile_get_media_type (profile);
339
 
                        if ((rb_gst_media_type_is_lossless (profile_media_type) == FALSE) &&
 
339
                        if (profile_media_type != NULL &&
 
340
                            (rb_gst_media_type_is_lossless (profile_media_type) == FALSE) &&
340
341
                            rb_encoder_get_missing_plugins (encoder, profile, NULL, NULL)) {
341
342
                                profiles = g_list_append (profiles, profile);
342
343
                        }