[FFmpeg-cvslog] ffmpeg: move packet deallocation into write_frame

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 24 19:50:39 2014 +0100| [cb640eb335429bacf008d852079ed30b05aa5209] | committer: Michael Niedermayer

ffmpeg: move packet deallocation into write_frame

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

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

 ffmpeg.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 2f8cc0e..a5c1026 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -666,6 +666,7 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
         main_return_code = 1;
         close_all_output_streams(ost, MUXER_FINISHED | ENCODER_FINISHED, ENCODER_FINISHED);
     }
+    av_free_packet(pkt);
 }
 
 static void close_output_stream(OutputStream *ost)
@@ -743,8 +744,6 @@ static void do_audio_out(AVFormatContext *s, OutputStream *ost,
         }
 
         write_frame(s, &pkt, ost);
-
-        av_free_packet(&pkt);
     }
 }
 
@@ -1037,7 +1036,6 @@ static void do_video_out(AVFormatContext *s,
 
             frame_size = pkt.size;
             write_frame(s, &pkt, ost);
-            av_free_packet(&pkt);
 
             /* if two pass, output log */
             if (ost->logfile && enc->stats_out) {