Merge commit '16381923fb7b9087ce559fb1cd3594469ac6788b'

[ffmpeg] / libavcodec / h264.c

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index d0d32d371713e47419859cd46111705310fcb0f0..8e9aee1b4a9d6dfaafc4277e86f52a4c38296ad8 100644 (file)
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3246,7 +3246,7 @@ static int h264_slice_header_init(H264Context *h, int reinit)
                   h->sps.num_units_in_tick, den, 1 << 30);
     }
 
-    h->avctx->hwaccel = ff_find_hwaccel(h->avctx->codec->id, h->avctx->pix_fmt);
+    h->avctx->hwaccel = ff_find_hwaccel(h->avctx);
 
     if (reinit)
         free_tables(h, 0);