highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avutil/frame: fix remove_side_data

Browse Source 
remove_side_data is supposed to remove a single instance by design.
Since new_side_data() doesn't forbid add multiple instances of the
same type, remove_side_data should deal with that.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Zhao Zhili
2019-11-03 01:41:18 +08:00
committed by Marton Balint
parent 0e49560806
commit 20c5f4d835
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavutil/frame.c
View File

@@ -806,7 +806,7 @@ void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type)
{ {
int i; int i;
for (i = 0; i < frame->nb_side_data; i++) { for (i = frame->nb_side_data - 1; i >= 0; i--) {
AVFrameSideData *sd = frame->side_data[i]; AVFrameSideData *sd = frame->side_data[i];
if (sd->type == type) { if (sd->type == type) {
free_side_data(&frame->side_data[i]); free_side_data(&frame->side_data[i]);

3
libavutil/frame.h
View File

@@ -920,8 +920,7 @@ AVFrameSideData *av_frame_get_side_data(const AVFrame *frame,
enum AVFrameSideDataType type); enum AVFrameSideDataType type);
/** /**
* If side data of the supplied type exists in the frame, free it and remove it * Remove and free all side data instances of the given type.
* from the frame.
*/ */
void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type); void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type);