---
48 is the "high framerate" used in cinema, 25 and 50 are European framerate.
Not sure it's worth to add 100 and 120 "high framerates" too.
Vittorio
libavformat/avformat.h | 2 +-
libavformat/utils.c | 3 ++-
libavformat/version.h | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 00380d7..26bd54d 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -712,7 +712,7 @@ typedef struct AVStream {
/**
* Stream information used internally by av_find_stream_info()
*/
-#define MAX_STD_TIMEBASES (60*12+5)
+#define MAX_STD_TIMEBASES (60 * 12 + 8)
struct {
int nb_decoded_frames;
int found_decoder;
diff --git a/libavformat/utils.c b/libavformat/utils.c
index fca588b..0b71ad2 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2177,7 +2177,8 @@ static int get_std_framerate(int i)
if (i < 60 * 12)
return (i + 1) * 1001;
else
- return ((const int[]) { 24, 30, 60, 12, 15 })[i - 60 * 12] * 1000 * 12;
+ return ((const int[]) { 24, 30, 60, 12, 15, 48, 25, 50 })
+ [i - 60 * 12] * 1000 * 12;
}
/* Is the time base unreliable?
diff --git a/libavformat/version.h b/libavformat/version.h
index dbdccb4..192beec 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 55
#define LIBAVFORMAT_VERSION_MINOR 10
-#define LIBAVFORMAT_VERSION_MICRO 3
+#define LIBAVFORMAT_VERSION_MICRO 4
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
--
1.7.9.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
