[FFmpeg-cvslog] ffmpeg: fix the used maximum dts in the monotone dts workaround

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May  3 14:58:28 2013 +0200| [007ee09d7ccf9f331c58e8edc0a3d8bed58be10b] | committer: Michael Niedermayer

ffmpeg: fix the used maximum dts in the monotone dts workaround

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 ffmpeg.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 2ad80ba..8c9d848 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -625,10 +625,10 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
         }
         av_log(NULL, AV_LOG_WARNING, "changing to %"PRId64". This may result "
                "in incorrect timestamps in the output file.\n",
-               ost->last_mux_dts + 1);
-        pkt->dts = ost->last_mux_dts + 1;
+               max);
+        pkt->dts = max;
         if (pkt->pts != AV_NOPTS_VALUE)
-            pkt->pts = FFMAX(pkt->pts, pkt->dts);
+            pkt->pts = FFMAX(pkt->pts, max);
       }
     }
     ost->last_mux_dts = pkt->dts;