[FFmpeg-cvslog] avcodec/h264: reset the counts in the correct context

[Michael Niedermayer]

ffmpeg | branch: release/2.5 | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  8 13:38:55 2015 +0200| [fe2df122b4c3441d4213a287c4d8f312a6e5a04a] | committer: Michael Niedermayer

avcodec/h264: reset the counts in the correct context

Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 8f8d632220100bfde26587b27da73901b05cb774)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe2df122b4c3441d4213a287c4d8f312a6e5a04a
---

 libavcodec/h264.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 0dd71dd..d7b146e 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1734,7 +1734,7 @@ again:
             if (err < 0 || err == SLICE_SKIPED) {
                 if (err < 0)
                     av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n");
-                h->ref_count[0] = h->ref_count[1] = h->list_count = 0;
+                hx->ref_count[0] = hx->ref_count[1] = hx->list_count = 0;
             } else if (err == SLICE_SINGLETHREAD) {
                 if (context_count > 1) {
                     ret = ff_h264_execute_decode_slices(h, context_count - 1);