need videoCodecContext as a fallback if codecpar does not exist

Signed-off-by: Michael Oliver <mcoliver@gmail.com>

Author: mcoliver

src/lib/image/MovieFFMpeg/MovieFFMpeg.cpp

@@ -1718,34 +1718,58 @@ namespace TwkMovie
         rotation = (rotEntry) ? atoi(rotEntry->value) : 0;
 
         // If rotation metadata not in metadata, try to get it from side data
-        if (!rotEntry && videoStream->codecpar->nb_coded_side_data > 0)
+        if (!rotEntry)
         {
             double rotationFromSideData = 0;
-            for (int i = 0; i < videoStream->codecpar->nb_coded_side_data; ++i)
+            bool foundMatrix = false;
+
+            if (videoStream->codecpar && videoStream->codecpar->nb_coded_side_data > 0)
             {
-                const AVPacketSideData* sd = &videoStream->codecpar->coded_side_data[i];
-                if (sd->type == AV_PKT_DATA_DISPLAYMATRIX)
+                for (int i = 0; i < videoStream->codecpar->nb_coded_side_data; ++i)
                 {
-                    rotationFromSideData = av_display_rotation_get((int32_t*)sd->data);
+                    const AVPacketSideData* sd = &videoStream->codecpar->coded_side_data[i];
+                    if (sd->type == AV_PKT_DATA_DISPLAYMATRIX)
+                    {
+                        rotationFromSideData = av_display_rotation_get((int32_t*)sd->data);
+                        foundMatrix = true;
+                        break;
+                    }
                 }
             }
 
-            // Getting rid of negative rotation metadata
-            rotation = rotationFromSideData < 0 ? lround(rotationFromSideData) + 360 : lround(rotationFromSideData);
-
-            // Setting rotation
-            char charRotation[5]; // Expecting a number between -360 and 360
-                                  // (inclusive)
-            sprintf(charRotation, "%d", rotation);
-            if (av_dict_set(&videoStream->metadata, "rotate", charRotation, 0) < 0)
+            if (!foundMatrix && videoCodecContext && videoCodecContext->nb_coded_side_data > 0)
             {
-                cout << "ERROR: Unable to rotate video, unable to parse "
-                        "rotation metadata."
-                     << endl;
+                for (int i = 0; i < videoCodecContext->nb_coded_side_data; ++i)
+                {
+                    const AVPacketSideData* sd = &videoCodecContext->coded_side_data[i];
+                    if (sd->type == AV_PKT_DATA_DISPLAYMATRIX)
+                    {
+                        rotationFromSideData = av_display_rotation_get((int32_t*)sd->data);
+                        foundMatrix = true;
+                        break;
+                    }
+                }
             }
-            else
+
+            if (foundMatrix)
             {
-                m_info.proxy.attribute<string>("Rotation") = charRotation;
+                // Getting rid of negative rotation metadata
+                rotation = rotationFromSideData < 0 ? lround(rotationFromSideData) + 360 : lround(rotationFromSideData);
+
+                // Setting rotation
+                char charRotation[5]; // Expecting a number between -360 and 360
+                                      // (inclusive)
+                sprintf(charRotation, "%d", rotation);
+                if (av_dict_set(&videoStream->metadata, "rotate", charRotation, 0) < 0)
+                {
+                    cout << "ERROR: Unable to rotate video, unable to parse "
+                            "rotation metadata."
+                         << endl;
+                }
+                else
+                {
+                    m_info.proxy.attribute<string>("Rotation") = charRotation;
+                }
             }
         }