[SCM] libav/experimental: Fix 2 access units in a packet mp4s. Fixes issue944 and possibly others.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:43:58 UTC 2013
The following commit has been merged in the experimental branch:
commit d225a1e24890e779ac7985a78857f5e8f0a6dba2
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Apr 12 20:43:52 2009 +0000
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
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 313ad26..e0250a9 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;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list