# HG changeset patch
# User michael
# Date 1239569032 0
# Node ID f2f83796f07b815e93d0ca65e69d4162d12ba300
# Parent  95f37e7d10cdac91fcad9dc0f39de3d08b1cd52d
Fix 2 access units in a packet mp4s.
Fixes issue944 and possibly others.

diff -r 95f37e7d10cd -r f2f83796f07b h264.c
--- a/h264.c	Sun Apr 12 20:40:18 2009 +0000
+++ b/h264.c	Sun Apr 12 20:43:52 2009 +0000
@@ -3660,6 +3660,8 @@
         ff_er_frame_end(s);
 
     MPV_frame_end(s);
+
+    h->current_slice=0;
 }
 
 /**
@@ -3720,7 +3722,11 @@
 
     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;