[FFmpeg-cvslog] lavc: factorize setting got_packet_ptr in avcodec_encode_video2()

Anton Khirnov git at videolan.org
Sun Feb 26 05:21:44 CET 2012


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Fri Feb 24 13:06:23 2012 +0100| [d55fa6f9cb1d374065229443fbb717f97df2110c] | committer: Anton Khirnov

lavc: factorize setting got_packet_ptr in avcodec_encode_video2()

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

 libavcodec/utils.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 4d07c9c..47cab41 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1093,10 +1093,11 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx,
     int ret;
     int user_packet = !!avpkt->data;
 
+    *got_packet_ptr = 0;
+
     if (!(avctx->codec->capabilities & CODEC_CAP_DELAY) && !frame) {
         av_init_packet(avpkt);
         avpkt->size     = 0;
-        *got_packet_ptr = 0;
         return 0;
     }
 
@@ -1105,7 +1106,6 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx,
 
     av_assert0(avctx->codec->encode2);
 
-    *got_packet_ptr = 0;
     ret = avctx->codec->encode2(avctx, avpkt, frame, got_packet_ptr);
     if (!ret) {
         if (!*got_packet_ptr)



More information about the ffmpeg-cvslog mailing list