
Update the chromium patch[1] to match the latest ffmpeg git master changes[2]. AVStream does not have the 'AVStreamInternal* internal' field anymore, and AVStreamInternal struct does not exist anymore either. The equivalent is now FFStream, and it should now be accessed by 'FFStream* ffstream(AVStream*)'. References ---------- [1]95aab0fd83
%5E%21/ [2]40bdd8cc05
30 lines
878 B
Diff
30 lines
878 B
Diff
--- a/libavformat/avformat.h
|
|
+++ b/libavformat/avformat.h
|
|
@@ -1128,6 +1128,10 @@ struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
|
|
*/
|
|
int64_t av_stream_get_end_pts(const AVStream *st);
|
|
|
|
+// Chromium: We use the internal field first_dts vvv
|
|
+int64_t av_stream_get_first_dts(const AVStream *st);
|
|
+// Chromium: We use the internal field first_dts ^^^
|
|
+
|
|
#define AV_PROGRAM_RUNNING 1
|
|
|
|
/**
|
|
--- a/libavformat/utils.c
|
|
+++ b/libavformat/utils.c
|
|
@@ -55,6 +55,13 @@ int ff_unlock_avformat(void)
|
|
return ff_mutex_unlock(&avformat_mutex) ? -1 : 0;
|
|
}
|
|
|
|
+// Chromium: We use the internal field first_dts vvv
|
|
+int64_t av_stream_get_first_dts(const AVStream *st)
|
|
+{
|
|
+ return ffstream(st)->first_dts;
|
|
+}
|
|
+// Chromium: We use the internal field first_dts ^^^
|
|
+
|
|
/* an arbitrarily chosen "sane" max packet size -- 50M */
|
|
#define SANE_CHUNK_SIZE (50000000)
|
|
|