Message ID | 20200328181515.5333-1-cus@passwd.hu |
---|---|
State | Accepted |
Commit | 4e0cf81b49b59da3ecaea30dc988a9bf5a8d9431 |
Headers | show |
Series | [FFmpeg-devel,1/8] fftools/ffmpeg: also flush encoders which have a variable frame size | expand |
Context | Check | Description |
---|---|---|
andriy/ffmpeg-patchwork | success | Make fate finished |
On Sat, 28 Mar 2020, Marton Balint wrote: > Signed-off-by: Marton Balint <cus@passwd.hu> > --- > fftools/ffmpeg.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c > index aaaf241314..6cc3c5a14d 100644 > --- a/fftools/ffmpeg.c > +++ b/fftools/ffmpeg.c > @@ -1913,9 +1913,6 @@ static void flush_encoders(void) > } > } > > - if (enc->codec_type == AVMEDIA_TYPE_AUDIO && enc->frame_size <= 1) > - continue; > - > if (enc->codec_type != AVMEDIA_TYPE_VIDEO && enc->codec_type != AVMEDIA_TYPE_AUDIO) > continue; Ping for this, will apply soon. Thanks, Marton
On Wed, 8 Apr 2020, Marton Balint wrote: > > > On Sat, 28 Mar 2020, Marton Balint wrote: > >> Signed-off-by: Marton Balint <cus@passwd.hu> >> --- >> fftools/ffmpeg.c | 3 --- >> 1 file changed, 3 deletions(-) >> >> diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c >> index aaaf241314..6cc3c5a14d 100644 >> --- a/fftools/ffmpeg.c >> +++ b/fftools/ffmpeg.c >> @@ -1913,9 +1913,6 @@ static void flush_encoders(void) >> } >> } >> >> - if (enc->codec_type == AVMEDIA_TYPE_AUDIO && enc->frame_size <= 1) >> - continue; >> - >> if (enc->codec_type != AVMEDIA_TYPE_VIDEO && enc->codec_type != > AVMEDIA_TYPE_AUDIO) >> continue; > > Ping for this, will apply soon. Applied. Regards, Marton
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index aaaf241314..6cc3c5a14d 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1913,9 +1913,6 @@ static void flush_encoders(void) } } - if (enc->codec_type == AVMEDIA_TYPE_AUDIO && enc->frame_size <= 1) - continue; - if (enc->codec_type != AVMEDIA_TYPE_VIDEO && enc->codec_type != AVMEDIA_TYPE_AUDIO) continue;
Signed-off-by: Marton Balint <cus@passwd.hu> --- fftools/ffmpeg.c | 3 --- 1 file changed, 3 deletions(-)