Message ID | 20170309144519.14212-1-nfxjfg@googlemail.com |
---|---|
State | Accepted |
Headers | show |
2017-03-09 22:45 GMT+08:00 wm4 <nfxjfg@googlemail.com>: > --- > libavformat/concatdec.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c > index 5cc239a1b6..8649916ff2 100644 > --- a/libavformat/concatdec.c > +++ b/libavformat/concatdec.c > @@ -322,6 +322,7 @@ static int open_file(AVFormatContext *avf, unsigned > fileno) > if (!cat->avf) > return AVERROR(ENOMEM); > > + cat->avf->flags |= avf->flags; > cat->avf->interrupt_callback = avf->interrupt_callback; > > if ((ret = ff_copy_whiteblacklists(cat->avf, avf)) < 0) > -- > 2.11.0 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > LGTM
On Thu, 9 Mar 2017 22:48:52 +0800 Steven Liu <lingjiujianke@gmail.com> wrote: > 2017-03-09 22:45 GMT+08:00 wm4 <nfxjfg@googlemail.com>: > > > --- > > libavformat/concatdec.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c > > index 5cc239a1b6..8649916ff2 100644 > > --- a/libavformat/concatdec.c > > +++ b/libavformat/concatdec.c > > @@ -322,6 +322,7 @@ static int open_file(AVFormatContext *avf, unsigned > > fileno) > > if (!cat->avf) > > return AVERROR(ENOMEM); > > > > + cat->avf->flags |= avf->flags; > > cat->avf->interrupt_callback = avf->interrupt_callback; > > > > if ((ret = ff_copy_whiteblacklists(cat->avf, avf)) < 0) > > -- > > 2.11.0 > > > > _______________________________________________ > > ffmpeg-devel mailing list > > ffmpeg-devel@ffmpeg.org > > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > > > LGTM Thanks for the review. Applied patches 1 and 2, the first with a FATE update from patch 3. (Didn't notice that before I ran FATE without patch 3. The reason is that FATE sometimes runs ffprobe with +keepside.)
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 5cc239a1b6..8649916ff2 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -322,6 +322,7 @@ static int open_file(AVFormatContext *avf, unsigned fileno) if (!cat->avf) return AVERROR(ENOMEM); + cat->avf->flags |= avf->flags; cat->avf->interrupt_callback = avf->interrupt_callback; if ((ret = ff_copy_whiteblacklists(cat->avf, avf)) < 0)