[FFmpeg-cvslog] qsv: Fix wrong ticks_per_frame for H.264

Ivan Uskov git at videolan.org
Wed Apr 27 16:34:37 CEST 2016


ffmpeg | branch: master | Ivan Uskov <ivan.uskov at nablet.com> | Tue Apr 26 10:13:04 2016 -0400| [b577a54a7c83986e59d2227c00a0227911c75452] | committer: Derek Buitenhuis

qsv: Fix wrong ticks_per_frame for H.264

For H.264 stream ticks_per_frame should be 2, as per the docs.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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

 libavcodec/qsvdec_h2645.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/qsvdec_h2645.c b/libavcodec/qsvdec_h2645.c
index a396f31..fda827c 100644
--- a/libavcodec/qsvdec_h2645.c
+++ b/libavcodec/qsvdec_h2645.c
@@ -82,9 +82,11 @@ static av_cold int qsv_decode_init(AVCodecContext *avctx)
         }
     }
 
-    if (avctx->codec_id == AV_CODEC_ID_H264)
+    if (avctx->codec_id == AV_CODEC_ID_H264) {
         s->bsf = av_bitstream_filter_init("h264_mp4toannexb");
-    else
+        //regarding ticks_per_frame description, should be 2 for h.264:
+        avctx->ticks_per_frame = 2;
+    } else
         s->bsf = av_bitstream_filter_init("hevc_mp4toannexb");
     if (!s->bsf) {
         ret = AVERROR(ENOMEM);



More information about the ffmpeg-cvslog mailing list