Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / mov.c

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 6a49f37741c51451c628501d8f036f38f5eb7cff..773760c98a2d4b2d9d9b2c67bf9bf9e77932df00 100644 (file)
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1928,7 +1928,7 @@ static int mov_read_tkhd(MOVContext *c, AVIOContext *pb, MOVAtom atom)
     sc->height = height >> 16;
 
     if (display_matrix[0][0] == -65536 && display_matrix[1][1] == -65536) {
-         av_metadata_set2(&st->metadata, "rotate", "180", 0);
+         av_dict_set(&st->metadata, "rotate", "180", 0);
     }
 
     // transform the display width/height according to the matrix
@@ -2202,7 +2202,7 @@ static int mov_read_elst(MOVContext *c, AVIOContext *pb, MOVAtom atom)
             time     = avio_rb64(pb);
         } else {
             duration = avio_rb32(pb); /* segment duration */
-            time     = avio_rb32(pb); /* media time */
+            time     = (int32_t)avio_rb32(pb); /* media time */
         }
         avio_rb32(pb); /* Media rate */
         if (i == 0 && time >= -1) {