Merge commit '9c029f67ca82147ddfa83a1546ee1e109e11fbd4'

[ffmpeg] / tools / uncoded_frame.c

diff --git a/tools/uncoded_frame.c b/tools/uncoded_frame.c
index da04d06ea1dcd2191fca7e99206df9c11fcd99cd..eafbbfde17ca638e90e3f56c05713de3297d5117 100644 (file)
--- a/tools/uncoded_frame.c
+++ b/tools/uncoded_frame.c
@@ -182,7 +182,7 @@ int main(int argc, char **argv)
             st->stream->codec->channel_layout = st->link->channel_layout;
             st->stream->codec->channels = avfilter_link_get_channels(st->link);
             st->stream->codec->sample_rate = st->link->sample_rate;
-            st->stream->codec->sample_fmt = st->link->format; 
+            st->stream->codec->sample_fmt = st->link->format;
             break;
         default:
             av_assert0(!"reached");
@@ -245,12 +245,12 @@ int main(int argc, char **argv)
                 ret = av_interleaved_write_uncoded_frame(st->mux,
                                                          st->stream->index,
                                                          frame);
+                frame = NULL;
                 if (ret < 0) {
                     av_log(st->stream->codec, AV_LOG_ERROR,
                            "Error writing frame: %s\n", av_err2str(ret));
                     goto fail;
                 }
-                frame = NULL;
             }
         }
     }