mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-13 13:25:37 +00:00
07d56f7ff5
This partially reverts commit e99d6caa3a3778c0bb1f2fa9f2b4222bba2eeafereverts FFmpeg requires specific default values in AVCodecContext to be set. It is quickly becoming too complicated to track what those should be. AVOptions automatically set all the values to their default. MozReview-Commit-ID: lDFeUvwTMg --HG-- extra : rebase_source : 04c5df11e485bcbae4fbf41d8b5ed512316b4d1b
53 lines
1.6 KiB
Diff
53 lines
1.6 KiB
Diff
diff --git a/media/ffvpx/libavutil/eval.c b/media/ffvpx/libavutil/eval.c
|
|
index 7642b91..e938bd5 100644
|
|
--- a/media/ffvpx/libavutil/eval.c
|
|
+++ b/media/ffvpx/libavutil/eval.c
|
|
@@ -34,7 +34,7 @@
|
|
#include "internal.h"
|
|
#include "log.h"
|
|
#include "mathematics.h"
|
|
-#include "time.h"
|
|
+#include "fftime.h"
|
|
#include "avstring.h"
|
|
#include "timer.h"
|
|
|
|
diff --git a/media/ffvpx/libavutil/time.h b/media/ffvpx/libavutil/fftime.h
|
|
similarity index 100%
|
|
rename from media/ffvpx/libavutil/time.h
|
|
rename to media/ffvpx/libavutil/fftime.h
|
|
diff --git a/media/ffvpx/libavutil/time.c b/media/ffvpx/libavutil/time.c
|
|
index dbaee02..69419e6 100644
|
|
--- a/media/ffvpx/libavutil/time.c
|
|
+++ b/media/ffvpx/libavutil/time.c
|
|
@@ -33,7 +33,7 @@
|
|
#include <windows.h>
|
|
#endif
|
|
|
|
-#include "time.h"
|
|
+#include "fftime.h"
|
|
#include "error.h"
|
|
|
|
int64_t av_gettime(void)
|
|
diff --git a/media/ffvpx/libavutil/parseutils.c b/media/ffvpx/libavutil/parseutils.c
|
|
index 9fb8d0a..97ad3b9 100644
|
|
--- a/media/ffvpx/libavutil/parseutils.c
|
|
+++ b/media/ffvpx/libavutil/parseutils.c
|
|
@@ -28,7 +28,7 @@
|
|
#include "common.h"
|
|
#include "eval.h"
|
|
#include "log.h"
|
|
-#include "random_seed.h"
|
|
+/* #include "random_seed.h" */
|
|
#include "time_internal.h"
|
|
#include "parseutils.h"
|
|
|
|
@@ -367,7 +367,7 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen,
|
|
rgba_color[3] = 255;
|
|
|
|
if (!av_strcasecmp(color_string2, "random") || !av_strcasecmp(color_string2, "bikeshed")) {
|
|
- int rgba = av_get_random_seed();
|
|
+ int rgba = 0xffffffff; /* av_get_random_seed(); */
|
|
rgba_color[0] = rgba >> 24;
|
|
rgba_color[1] = rgba >> 16;
|
|
rgba_color[2] = rgba >> 8;
|