commit b800dfd8239f6fe0248b3034d75429b1e452d5e2
author Robert Shih <robertshih@google.com> Fri Jul 15 22:03:00 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 15 22:03:00 2016 +0000
tree 5f91d154c57646b5a585bb2fe08dee547e81ada9
parent 1161d40421a58cb4f321e9a2c0eee17121f477f5
parent 30474b19a4f9785494d34c15ee2deabe36970814

Merge "rtsp: remove CHECK to ignore unsupported tracks" into nyc-mr1-dev

media/libstagefright/rtsp/ASessionDescription.cpp

diff --git a/media/libstagefright/rtsp/ASessionDescription.cpp b/media/libstagefright/rtsp/ASessionDescription.cpp
index 47573c3..8b0331a 100644
--- a/media/libstagefright/rtsp/ASessionDescription.cpp
+++ b/media/libstagefright/rtsp/ASessionDescription.cpp
@@ -214,11 +214,13 @@
 
     char key[32];
     snprintf(key, sizeof(key), "a=rtpmap:%lu", x);
-
-    CHECK(findAttribute(index, key, desc));
-
-    snprintf(key, sizeof(key), "a=fmtp:%lu", x);
-    if (!findAttribute(index, key, params)) {
+    if (findAttribute(index, key, desc)) {
+        snprintf(key, sizeof(key), "a=fmtp:%lu", x);
+        if (!findAttribute(index, key, params)) {
+            params->clear();
+        }
+    } else {
+        desc->clear();
         params->clear();
     }
 }