[FFmpeg-cvslog] avformat/cdg: Do not fail if filesize cannot be determined

Michael Niedermayer git at videolan.org
Fri Jul 11 01:15:28 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 11 01:04:04 2014 +0200| [0089fb79cc11eef199c0c63da472aefbeb9fed2c] | committer: Michael Niedermayer

avformat/cdg: Do not fail if filesize cannot be determined

This fixes cdg with piped input which was broken by the previous commit

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

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

 libavformat/cdg.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libavformat/cdg.c b/libavformat/cdg.c
index f0c14a6..baf37d4 100644
--- a/libavformat/cdg.c
+++ b/libavformat/cdg.c
@@ -46,10 +46,11 @@ static int read_header(AVFormatContext *s)
     avpriv_set_pts_info(vst, 32, 1, 300);
 
     ret = avio_size(s->pb);
-    if (ret < 0)
-        return ret;
+    if (ret < 0) {
+        av_log(s, AV_LOG_WARNING, "Cannot calculate duration as file size cannot be determined\n");
+    } else
+        vst->duration = (ret * vst->time_base.den) / (CDG_PACKET_SIZE * 300);
 
-    vst->duration = (ret * vst->time_base.den) / (CDG_PACKET_SIZE * 300);
     return 0;
 }
 



More information about the ffmpeg-cvslog mailing list