diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 12:55:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 12:55:21 +0100 |
| commit | ed8de1570db856ba830c3e4b19b5628ab24a8853 (patch) | |
| tree | f294d2fd0292809bffe8a29039f39f6fb160d27b /libavcodec/h264.c | |
| parent | 5f2cdf9c3cc5e1159428999ec550a3979576c213 (diff) | |
| parent | f9f883af4fe615a832407a657752e248a96c6280 (diff) | |
| download | ffmpeg-ed8de1570db856ba830c3e4b19b5628ab24a8853.tar.gz | |
Merge commit 'f9f883af4fe615a832407a657752e248a96c6280'
* commit 'f9f883af4fe615a832407a657752e248a96c6280':
h264: simplify code in flush_dpb()
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 23f775414f..35473dff62 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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); |