| Message ID | 3169cf0a.5f9d.189241f3e9e.Coremail.liqitong@163.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] fftools/ffplay: Fixed typo in frame_queue_destory | expand |
| Context | Check | Description |
|---|---|---|
| andriy/configure_x86 | warning | Failed to apply patch |
| yinshiyou/configure_loongarch64 | warning | Failed to apply patch |
QiTong Li <liqitong@163.com> 于2023年7月5日周三 11:36写道： > > Not sure if the function naming frame_queue_destory is intended because "destory" is not really a word. Changing it to "destroy" makes more sense. > > Signed-off-by: QiTong Li <liqitong@163.com> > --- > fftools/ffplay.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/fftools/ffplay.c b/fftools/ffplay.c > index 663f61d8b2..51cde0d208 100644 > --- a/fftools/ffplay.c > +++ b/fftools/ffplay.c > @@ -696,7 +696,7 @@ static int frame_queue_init(FrameQueue *f, PacketQueue *pktq, int max_size, int > return 0; > } > > -static void frame_queue_destory(FrameQueue *f) > +static void frame_queue_destroy(FrameQueue *f) > { > int i; > for (i = 0; i < f->max_size; i++) { > @@ -1252,9 +1252,9 @@ static void stream_close(VideoState *is) > packet_queue_destroy(&is->subtitleq); > > /* free all pictures */ > - frame_queue_destory(&is->pictq); > - frame_queue_destory(&is->sampq); > - frame_queue_destory(&is->subpq); > + frame_queue_destroy(&is->pictq); > + frame_queue_destroy(&is->sampq); > + frame_queue_destroy(&is->subpq); > SDL_DestroyCond(is->continue_read_thread); > sws_freeContext(is->sub_convert_ctx); > av_free(is->filename); > -- > 2.33.0.windows.2 > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". LGTM Thanks
On Wed, 5 Jul 2023, QiTong Li wrote: > Not sure if the function naming frame_queue_destory is intended because "destory" is not really a word. Changing it to "destroy" makes more sense. > Thanks, will apply. Regards, Marton > Signed-off-by: QiTong Li <liqitong@163.com> > --- > fftools/ffplay.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/fftools/ffplay.c b/fftools/ffplay.c > index 663f61d8b2..51cde0d208 100644 > --- a/fftools/ffplay.c > +++ b/fftools/ffplay.c > @@ -696,7 +696,7 @@ static int frame_queue_init(FrameQueue *f, PacketQueue *pktq, int max_size, int > return 0; > } > > -static void frame_queue_destory(FrameQueue *f) > +static void frame_queue_destroy(FrameQueue *f) > { > int i; > for (i = 0; i < f->max_size; i++) { > @@ -1252,9 +1252,9 @@ static void stream_close(VideoState *is) > packet_queue_destroy(&is->subtitleq); > > /* free all pictures */ > - frame_queue_destory(&is->pictq); > - frame_queue_destory(&is->sampq); > - frame_queue_destory(&is->subpq); > + frame_queue_destroy(&is->pictq); > + frame_queue_destroy(&is->sampq); > + frame_queue_destroy(&is->subpq); > SDL_DestroyCond(is->continue_read_thread); > sws_freeContext(is->sub_convert_ctx); > av_free(is->filename); > -- > 2.33.0.windows.2 > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". >
diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 663f61d8b2..51cde0d208 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -696,7 +696,7 @@ static int frame_queue_init(FrameQueue *f, PacketQueue *pktq, int max_size, int return 0; } -static void frame_queue_destory(FrameQueue *f) +static void frame_queue_destroy(FrameQueue *f) { int i; for (i = 0; i < f->max_size; i++) { @@ -1252,9 +1252,9 @@ static void stream_close(VideoState *is) packet_queue_destroy(&is->subtitleq); /* free all pictures */ - frame_queue_destory(&is->pictq); - frame_queue_destory(&is->sampq); - frame_queue_destory(&is->subpq); + frame_queue_destroy(&is->pictq); + frame_queue_destroy(&is->sampq); + frame_queue_destroy(&is->subpq); SDL_DestroyCond(is->continue_read_thread); sws_freeContext(is->sub_convert_ctx); av_free(is->filename);
Not sure if the function naming frame_queue_destory is intended because "destory" is not really a word. Changing it to "destroy" makes more sense. Signed-off-by: QiTong Li <liqitong@163.com> --- fftools/ffplay.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)