From: Alexander Reshetnikov <no@email>
Date: Mon, 9 Apr 2012 13:35:48 +0000 (+0000)
Subject: Fixed ffmpeg encoding error (ticket #1743)
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1314^2~2201
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=264dff523197b4bde6a6fc70b687901524de8cbd;p=platform%2Fupstream%2Fopencv.git

Fixed ffmpeg encoding error (ticket #1743)
---

diff --git a/modules/highgui/src/cap_ffmpeg_impl.hpp b/modules/highgui/src/cap_ffmpeg_impl.hpp
index fa847ce..c154abe 100644
--- 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;
diff --git a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
index e14794b..a839874 100755
--- 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;