[FFmpeg-cvslog] avformat/asfenc: fix a build error

Chih-Wei Huang git at videolan.org
Tue Sep 17 19:43:00 CEST 2013


ffmpeg | branch: master | Chih-Wei Huang <cwhuang at linux.org.tw> | Tue Sep 17 23:36:48 2013 +0800| [985920433cdb7795ca3966329c76c7a670385132] | committer: Michael Niedermayer

avformat/asfenc: fix a build error

It's introduced by the erroneous merging commit cbe47b1e.

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

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

 libavformat/asfenc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c
index 85748c7..516e0d0 100644
--- a/libavformat/asfenc.c
+++ b/libavformat/asfenc.c
@@ -869,7 +869,7 @@ static int asf_write_trailer(AVFormatContext *s)
     /* write index */
     data_size = avio_tell(s->pb);
     if (!asf->is_streamed && asf->next_start_sec) {
-        if ((ret = update_index(s, asf->end_sec + 1, 0, 0)) < ret)
+        if ((ret = update_index(s, asf->end_sec + 1, 0, 0)) < 0)
             return ret;
         asf_write_index(s, asf->index_ptr, asf->maximum_packet, asf->next_start_sec);
     }



More information about the ffmpeg-cvslog mailing list