Commit 94ed93b9 authored by michael's avatar michael

Fix 2 access units in a packet mp4s.

Fixes issue944 and possibly others.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18474 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 2eee5c45
...@@ -3660,6 +3660,8 @@ static void field_end(H264Context *h){ ...@@ -3660,6 +3660,8 @@ static void field_end(H264Context *h){
ff_er_frame_end(s); ff_er_frame_end(s);
MPV_frame_end(s); MPV_frame_end(s);
h->current_slice=0;
} }
/** /**
...@@ -3720,7 +3722,11 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ ...@@ -3720,7 +3722,11 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
first_mb_in_slice= get_ue_golomb(&s->gb); 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; h0->current_slice = 0;
if (!s0->first_field) if (!s0->first_field)
s->current_picture_ptr= NULL; s->current_picture_ptr= NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment