From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Thu, 11 Feb 2010 18:43:47 +0000 (+0100)
Subject: qtdemux: avoid erroneous codec-data overriding of stsd information
X-Git-Tag: RELEASE-0.10.22~235
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=561a50682224dd8cdef41afc8647c0abddb21610;p=platform%2Fupstream%2Fgst-plugins-good.git

qtdemux: avoid erroneous codec-data overriding of stsd information
---

diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 451a089..224c00e 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -7046,7 +7046,8 @@ gst_qtdemux_handle_esds (GstQTDemux * qtdemux, QtDemuxStream * stream,
     case 0x68:                 /* AAC SSR */
       /* Override channels and rate based on the codec_data, as it's often
        * wrong. */
-      if (data_ptr && data_len >= 2) {
+      /* Only do so for basic setup without HE-AAC extension */
+      if (data_ptr && data_len == 2) {
         guint channels, rateindex;
         int rates[] = { 96000, 88200, 64000, 48000, 44100, 32000,
           24000, 22050, 16000, 12000, 11025, 8000