You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-15 14:13:16 +02:00
Merge commit 'f9f883af4fe615a832407a657752e248a96c6280'
* commit 'f9f883af4fe615a832407a657752e248a96c6280': h264: simplify code in flush_dpb() Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
@@ -1107,11 +1107,7 @@ static void flush_dpb(AVCodecContext *avctx)
|
||||
H264Context *h = avctx->priv_data;
|
||||
int i;
|
||||
|
||||
for (i = 0; i <= MAX_DELAYED_PIC_COUNT; i++) {
|
||||
if (h->delayed_pic[i])
|
||||
h->delayed_pic[i]->reference = 0;
|
||||
h->delayed_pic[i] = NULL;
|
||||
}
|
||||
memset(h->delayed_pic, 0, sizeof(h->delayed_pic));
|
||||
|
||||
ff_h264_flush_change(h);
|
||||
|
||||
|
Reference in New Issue
Block a user