[FFmpeg-cvslog] Simplify condition.

Reimar Döffinger git at videolan.org
Sat May 7 10:41:26 CEST 2011


ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Sat May  7 09:47:35 2011 +0200| [6266c515389a2d77951b204ff21c9eeb67758fdf] | committer: Reimar Döffinger

Simplify condition.

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

 libavformat/nutenc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index b5c5c7e..4756ca2 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -589,7 +589,7 @@ static int write_header(AVFormatContext *s){
     nut->chapter  = av_mallocz(sizeof(ChapterContext)*s->nb_chapters);
     nut->time_base= av_mallocz(sizeof(AVRational   )*(s->nb_streams +
                                                       s->nb_chapters));
-    if (!nut->stream || (s->nb_chapters && !nut->chapter) || !nut->time_base) {
+    if (!nut->stream || !nut->chapter || !nut->time_base) {
         av_freep(&nut->stream);
         av_freep(&nut->chapter);
         av_freep(&nut->time_base);



More information about the ffmpeg-cvslog mailing list