← Back to branch summary

~ubuntu-branches/ubuntu/wily/gst-plugins-base1.0/wily

« back to all changes in this revision

Viewing changes to gst-libs/gst/pbutils/descriptions.c

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2013-11-15 10:13:40 UTC
  • mfrom: (1.1.19) (21.1.1 trusty-proposed)
  • Revision ID: package-import@ubuntu.com-20131115101340-1svovntvcbntyntt
Tags: 1.2.1-2ubuntu1
* Merge from Debian unstable.  Remaining changes:
  + debian/patches/aarch64_fail_neon_check.patch: Disable NEON
    on arm64, as the assembly is ARMv7-specific.
* Fix "Description: Description:" in control. Thanks, lintian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gst-libs/gst/pbutils/descriptions.c
269
269
  {"image/vnd.wap.wbmp", "Wireless Bitmap", FLAG_IMAGE, "wbmp"},
270
270
 
271
271
  /* subtitle formats with static descriptions */
 
272
  {"text/x-raw", N_("Timed Text"), FLAG_SUB, ""},
272
273
  {"application/x-ssa", "SubStation Alpha", FLAG_SUB, ""},
273
274
  {"application/x-ass", "Advanced SubStation Alpha", FLAG_SUB, ""},
274
275
  /* FIXME: add variant field to typefinder? */
610
611
        }
611
612
        GST_WARNING ("Unexpected MPEG-1 layer in %" GST_PTR_FORMAT, caps);
612
613
        return g_strdup ("MPEG-1 Audio");
 
614
      case 2:
 
615
        return g_strdup ("MPEG-2 AAC");
613
616
      case 4:
614
617
        return g_strdup ("MPEG-4 AAC");
615
618
      default: