From d225a1e24890e779ac7985a78857f5e8f0a6dba2 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 12 Apr 2009 20:43:52 +0000
Subject: Fix 2 access units in a packet mp4s. Fixes issue944 and possibly
 others.

Originally committed as revision 18474 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/h264.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'libavcodec')

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 313ad2696f..e0250a99d3 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3660,6 +3660,8 @@ static void field_end(H264Context *h){
         ff_er_frame_end(s);
 
     MPV_frame_end(s);
+
+    h->current_slice=0;
 }
 
 /**
@@ -3720,7 +3722,11 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
 
     first_mb_in_slice= get_ue_golomb(&s->gb);
 
-    if((s->flags2 & CODEC_FLAG2_CHUNKS) && first_mb_in_slice == 0){
+    if(first_mb_in_slice == 0){ //FIXME better field boundary detection
+        if(h0->current_slice && FIELD_PICTURE){
+            field_end(h);
+        }
+
         h0->current_slice = 0;
         if (!s0->first_field)
             s->current_picture_ptr= NULL;
-- 
cgit v1.2.3