avformat/http: fix memory leak in parse_cookie.

[ffmpeg] / libavformat / mxf.c

diff --git a/libavformat/mxf.c b/libavformat/mxf.c
index bfc3218b815a0a88f7f349078127c973cddb5816..a909401f08b98676b384b7d1131dfc6ee7b32eeb 100644 (file)
--- a/libavformat/mxf.c
+++ b/libavformat/mxf.c
@@ -137,6 +137,7 @@ static const MXFSamplesPerFrame mxf_spf[] = {
     { { 1001, 60000 }, { 801,  801,  801,  801,  800,  0 } }, // NTSC 59.94
     { { 1, 25 },       { 1920, 0,    0,    0,    0,    0 } }, // PAL 25
     { { 1, 50 },       { 960,  0,    0,    0,    0,    0 } }, // PAL 50
+    { { 1, 60 },       { 800,  0,    0,    0,    0,    0 } },
 };
 
 static const AVRational mxf_time_base[] = {
@@ -146,6 +147,7 @@ static const AVRational mxf_time_base[] = {
     { 1001, 60000 },
     { 1, 25 },
     { 1, 50 },
+    { 1, 60 },
     { 0, 0}
 };
 
@@ -155,7 +157,7 @@ const MXFSamplesPerFrame *ff_mxf_get_samples_per_frame(AVFormatContext *s,
     int idx = av_find_nearest_q_idx(time_base, mxf_time_base);
     AVRational diff = av_sub_q(time_base, mxf_time_base[idx]);
 
-    diff.num = abs(diff.num);
+    diff.num = FFABS(diff.num);
 
     if (av_cmp_q(diff, (AVRational){1, 1000}) >= 0)
         return NULL;