summaryrefslogtreecommitdiff
path: root/ext/ffmpeg
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2011-05-29 17:39:38 +0200
committerEdward Hervey <bilboed@bilboed.com>2011-05-29 20:09:47 +0200
commit9db205f9f7335dfa86ce4215dabf866e8156758d (patch)
tree6089d457013fb92e5e2c0b7b010e70e29f075131 /ext/ffmpeg
parenta026c95caf0dc645aee43e2c0e3ebd61aee084fc (diff)
ffmpegdec: Don't discard timestamps if output AND input are in order
Avoids bogus timestamps for AVCHD-lite streams
Diffstat (limited to 'ext/ffmpeg')
-rw-r--r--ext/ffmpeg/gstffmpegdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index 71fe9e3..605acb6 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -1791,7 +1791,7 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
/* we assume DTS as input timestamps unless we see reordered input
* timestamps */
- if (!ffmpegdec->reordered_in) {
+ if (!ffmpegdec->reordered_in && ffmpegdec->reordered_out) {
/* PTS and DTS are the same for keyframes */
if (!iskeyframe && ffmpegdec->next_out != -1) {
/* interpolate all timestamps except for keyframes, FIXME, this is