diff mbox

[FFmpeg-devel] lavc/h264: simplify find_unused_picture()

Message ID 20170118171302.10946-1-u@pkh.me
State Accepted
Commit e5ac554ba7d6c0298a2504f9dc2411a81e1a6d96
Headers show

Commit Message

Clément Bœsch Jan. 18, 2017, 5:13 p.m. UTC 
---
 libavcodec/h264_slice.c | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

Comments

Michael Niedermayer Jan. 19, 2017, 1:37 a.m. UTC | #1 
On Wed, Jan 18, 2017 at 06:13:02PM +0100, Clément Bœsch wrote:
> ---
>  libavcodec/h264_slice.c | 16 +++-------------
>  1 file changed, 3 insertions(+), 13 deletions(-)

LGTM

thx

[...]
Clément Bœsch Jan. 19, 2017, 9:40 a.m. UTC | #2 
On Thu, Jan 19, 2017 at 02:37:09AM +0100, Michael Niedermayer wrote:
> On Wed, Jan 18, 2017 at 06:13:02PM +0100, Clément Bœsch wrote:
> > ---
> >  libavcodec/h264_slice.c | 16 +++-------------
> >  1 file changed, 3 insertions(+), 13 deletions(-)
> 
> LGTM
> 
> thx
> 

pushed
diff mbox

Patch

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;
 }