Fixed ffmpeg encoding error (ticket #1743)

264dff52 · Alexander Reshetnikov · aa4a45ff · 264dff52 · 264dff52
Commit 264dff52 authored Apr 09, 2012 by Alexander Reshetnikov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

cap_ffmpeg_impl.hpp modules/highgui/src/cap_ffmpeg_impl.hpp +1 -0

cap_ffmpeg_impl_v2.hpp modules/highgui/src/cap_ffmpeg_impl_v2.hpp +1 -0

No files found.
--- a/modules/highgui/src/cap_ffmpeg_impl.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp
@@ -966,6 +966,7 @@ int icv_av_write_frame_FFMPEG( AVFormatContext * oc, AVStream * video_st, uint8_
            av_init_packet(&pkt);

 #if LIBAVFORMAT_BUILD > 4752
+            if(c->coded_frame->pts != (int64_t)AV_NOPTS_VALUE)
            pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, video_st->time_base);
 #else
 			pkt.pts = c->coded_frame->pts;

--- a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
@@ -1085,6 +1085,7 @@ int icv_av_write_frame_FFMPEG( AVFormatContext * oc, AVStream * video_st, uint8_
            av_init_packet(&pkt);

 	#if LIBAVFORMAT_BUILD > 4752
+                if(c->coded_frame->pts != (int64_t)AV_NOPTS_VALUE)
 				pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, video_st->time_base);
 	#else
 				pkt.pts = c->coded_frame->pts;