[FFmpeg-cvslog] movdec: Ignore sample_degradation_priority bits when checking first_sample_flags

Martin Storsjö git at videolan.org
Wed Feb 1 03:06:29 CET 2012


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Wed Jan 18 15:12:10 2012 +0200| [75ab1e62d4187c8ad627835ee8fcf38501477caf] | committer: Martin Storsjö

movdec: Ignore sample_degradation_priority bits when checking first_sample_flags

This makes the first packet of a track fragment run to get
the keyframe flag set properly if sample_degradation_priority
is nonzero.

This makes the keyframes flag be set properly for ismv files
created by Microsoft.

Signed-off-by: Martin Storsjö <martin at martin.st>

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

 libavformat/mov.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index b7d8a55..0ce32e0 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2250,7 +2250,7 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom)
         sc->ctts_data[sc->ctts_count].duration = (flags & 0x800) ? avio_rb32(pb) : 0;
         sc->ctts_count++;
         if ((keyframe = st->codec->codec_type == AVMEDIA_TYPE_AUDIO ||
-             (flags & 0x004 && !i && !sample_flags) || sample_flags & 0x2000000))
+             (flags & 0x004 && !i && !(sample_flags & 0xffff0000)) || sample_flags & 0x2000000))
             distance = 0;
         av_add_index_entry(st, offset, dts, sample_size, distance,
                            keyframe ? AVINDEX_KEYFRAME : 0);



More information about the ffmpeg-cvslog mailing list