[FFmpeg-cvslog] h264: skip error concealment when SPS and slices are mismatching

[Michael Niedermayer]

ffmpeg | branch: release/0.11 | Michael Niedermayer <michaelni at gmx.at> | Sat Feb  2 21:11:54 2013 +0100| [1934bb75361e7859873c6bf94ee1ceb17981c550] | committer: Michael Niedermayer

h264: skip error concealment when SPS and slices are mismatching

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 695af8eed642ff0104834495652d1ee784a4c14d)

Conflicts:

	libavcodec/h264.c

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

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

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 059d65b..1e6326f 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2783,7 +2783,7 @@ static int field_end(H264Context *h, int in_setup)
      * past end by one (callers fault) and resync_mb_y != 0
      * causes problems for the first MB line, too.
      */
-    if (!FIELD_PICTURE)
+    if (!FIELD_PICTURE && h->current_slice && !h->sps.new)
         ff_er_frame_end(s);
 
     ff_MPV_frame_end(s);