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

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  8 13:38:55 2015 +0200| [2b69da7b5ac3b6f96847f350f3f03c30b82832e9] | 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)

Conflicts:

	libavcodec/h264.c

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

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

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index f17304e..92c9fbc 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -5223,7 +5223,7 @@ again:
 
             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 == 1) {
                 if (context_count > 1) {
                     ret = execute_decode_slices(h, context_count - 1);