diff options
| author | Gyan Doshi <ffmpeg@gyani.pro> | 2018-04-21 12:44:12 +0530 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-04-22 16:34:39 -0300 |
| commit | 6b2fee19a7ddeac220f851c368e4262205458166 (patch) | |
| tree | 35fb86f22a87bfc6540928940c00585f04155e04 | |
| parent | 8cd79c2e73d487d7ac258fd4e753ca45c546f581 (diff) | |
| download | ffmpeg-6b2fee19a7ddeac220f851c368e4262205458166.tar.gz | |
avformat/segafilm - revert keyframe detection
Keyframe detection was inverted in cfe1a9d311 in order to fix keyframe
flags set for the sample attached to trac #7091. However, that sample is
errantly muxed.
As noted at
https://web.archive.org/web/20020803104640/http://www.pcisys.net:80/~melanson/codecs/film-format.txt,
the original keyframe detection logic is correct, and this patch
restores it.
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 9f9f56e6791f6c44ac8e4b97a8da5816ed542332)
| -rw-r--r-- | libavformat/segafilm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index e72c26b144..b0c6c419ce 100644 --- a/libavformat/segafilm.c +++ b/libavformat/segafilm.c @@ -239,7 +239,7 @@ static int film_read_header(AVFormatContext *s) } else { film->sample_table[i].stream = film->video_stream_index; film->sample_table[i].pts = AV_RB32(&scratch[8]) & 0x7FFFFFFF; - film->sample_table[i].keyframe = (scratch[8] & 0x80) ? AVINDEX_KEYFRAME : 0; + film->sample_table[i].keyframe = (scratch[8] & 0x80) ? 0 : AVINDEX_KEYFRAME; video_frame_counter++; if (film->video_type) av_add_index_entry(s->streams[film->video_stream_index], |