[FFmpeg-cvslog] swr: make the default of nopts for first_pts actually work

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 25 03:04:03 2013 +0100| [35aaa306ac2d6f699af430a7d4a3b85790d2269d] | committer: Michael Niedermayer

swr: make the default of nopts for first_pts actually work

Fixes Ticket2210

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

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

 libswresample/swresample.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index f85f88f..9b71b2e 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -339,7 +339,8 @@ av_cold int swr_init(struct SwrContext *s){
             s->async = 1;
         s->firstpts =
         s->outpts   = s->firstpts_in_samples * s->out_sample_rate;
-    }
+    } else
+        s->firstpts = AV_NOPTS_VALUE;
 
     if (s->async) {
         if (s->min_compensation >= FLT_MAX/2)
@@ -899,6 +900,10 @@ int swr_set_compensation(struct SwrContext *s, int sample_delta, int compensatio
 int64_t swr_next_pts(struct SwrContext *s, int64_t pts){
     if(pts == INT64_MIN)
         return s->outpts;
+
+    if (s->firstpts == AV_NOPTS_VALUE)
+        s->outpts = s->firstpts = pts;
+
     if(s->min_compensation >= FLT_MAX) {
         return (s->outpts = pts - swr_get_delay(s, s->in_sample_rate * (int64_t)s->out_sample_rate));
     } else {