Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / oggparseskeleton.c

diff --git a/libavformat/oggparseskeleton.c b/libavformat/oggparseskeleton.c
index e318e9e7188f41652a43d7d7ecd3ddad24c769df..8d8e5dc10d6e15d3cb6784c05b8b55e63cd830e1 100644 (file)
--- a/libavformat/oggparseskeleton.c
+++ b/libavformat/oggparseskeleton.c
@@ -20,6 +20,7 @@
 
 #include "libavcodec/bytestream.h"
 #include "avformat.h"
+#include "internal.h"
 #include "oggdec.h"
 
 static int skeleton_header(AVFormatContext *s, int idx)
@@ -45,7 +46,7 @@ static int skeleton_header(AVFormatContext *s, int idx)
         version_major = AV_RL16(buf+8);
         version_minor = AV_RL16(buf+10);
 
-        if (version_major != 3) {
+        if (version_major != 3 && version_major != 4) {
             av_log(s, AV_LOG_WARNING, "Unknown skeleton version %d.%d\n",
                    version_major, version_minor);
             return -1;
@@ -62,7 +63,7 @@ static int skeleton_header(AVFormatContext *s, int idx)
         if (start_den) {
             int base_den;
             av_reduce(&start_time, &base_den, start_num, start_den, INT_MAX);
-            av_set_pts_info(st, 64, 1, base_den);
+            avpriv_set_pts_info(st, 64, 1, base_den);
             os->lastpts =
             st->start_time = start_time;
         }