X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fthirdparty%2Fsrc%2Fffmpeg.git.patch4;h=9e472ce1697e0ecbd588af46bd6c16e0d7d52edf;hb=HEAD;hp=02c274281d4e16ff014c1330766c691f65caa2f0;hpb=d830901b11606a7838791bc45e39130329db99f0;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch4 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch4
index 02c27428..9e472ce1 100644
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch4
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch4
@@ -1,29 +1,10 @@
-diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c
-index 1a702778c3..232d629ba0 100644
---- a/libavfilter/af_aformat.c
-+++ b/libavfilter/af_aformat.c
-@@ -112,6 +112,16 @@ static av_cold int init(AVFilterContext *ctx)
-     return 0;
- }
- 
-+#define DEL_FIELD(p,mem,fld) if( p->mem ) { av_freep(&p->mem->fld); av_freep(&p->mem); }
-+
-+static av_cold void uninit(AVFilterContext *ctx)
-+{
-+    AFormatContext *s = ctx->priv;
-+    DEL_FIELD(s, formats, formats);
-+    DEL_FIELD(s, sample_rates, formats);
-+    DEL_FIELD(s, channel_layouts, channel_layouts);
-+}
-+
- static int query_formats(AVFilterContext *ctx)
- {
-     AFormatContext *s = ctx->priv;
-@@ -149,6 +159,7 @@ AVFilter ff_af_aformat = {
-     .name          = "aformat",
-     .description   = NULL_IF_CONFIG_SMALL("Convert the input audio to one of the specified formats."),
-     .init          = init,
-+    .uninit        = uninit,
-     .query_formats = query_formats,
-     .priv_size     = sizeof(AFormatContext),
-     .priv_class    = &aformat_class,
+--- a/libavformat/avidec.c
++++ b/libavformat/avidec.c
+@@ -2020,6 +2020,7 @@
+     .p.name         = "avi",
+     .p.long_name    = NULL_IF_CONFIG_SMALL("AVI (Audio Video Interleaved)"),
+     .p.extensions   = "avi",
++    .p.flags        = AVFMT_SEEK_NOSTREAMS,
+     .p.priv_class   = &demuxer_class,
+     .priv_data_size = sizeof(AVIContext),
+     .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP,