diff options
| author | Clément Bœsch <u@pkh.me> | 2017-01-18 18:13:02 +0100 |
|---|---|---|
| committer | Clément Bœsch <cboesch@gopro.com> | 2017-01-19 10:34:10 +0100 |
| commit | e5ac554ba7d6c0298a2504f9dc2411a81e1a6d96 (patch) | |
| tree | 479cd112277dd3144360bc6cd6978bd9faf8c07a | |
| parent | bcfa8551a1a1a931683bdbd7dac696868c6a9ce5 (diff) | |
| download | ffmpeg-e5ac554ba7d6c0298a2504f9dc2411a81e1a6d96.tar.gz | |
lavc/h264: simplify find_unused_picture()
| -rw-r--r-- | libavcodec/h264_slice.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index fe71d57421..ad7a75fa2e 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -254,25 +254,15 @@ fail: return (ret < 0) ? ret : AVERROR(ENOMEM); } -static inline int pic_is_unused(H264Context *h, H264Picture *pic) -{ - if (!pic->f->buf[0]) - return 1; - return 0; -} - static int find_unused_picture(H264Context *h) { int i; for (i = 0; i < H264_MAX_PICTURE_COUNT; i++) { - if (pic_is_unused(h, &h->DPB[i])) - break; + if (!h->DPB[i].f->buf[0]) + return i; } - if (i == H264_MAX_PICTURE_COUNT) - return AVERROR_INVALIDDATA; - - return i; + return AVERROR_INVALIDDATA; } |