[FFmpeg-cvslog] avcodec/utils/ff_init_buffer_info factor avctx->internal->pkt; out

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May  1 22:59:59 2014 +0200| [2ff81d09160626d0c7919a0db73a9428abe2cef1] | committer: Michael Niedermayer

avcodec/utils/ff_init_buffer_info factor avctx->internal->pkt; out

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

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

 libavcodec/utils.c |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 444b9b2..b899392 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -747,17 +747,19 @@ FF_ENABLE_DEPRECATION_WARNINGS
 
 int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame)
 {
-    if (avctx->internal->pkt) {
+    AVPacket *pkt = avctx->internal->pkt;
+
+    if (pkt) {
         uint8_t *packet_sd;
         AVFrameSideData *frame_sd;
         int size;
-        frame->pkt_pts = avctx->internal->pkt->pts;
-        av_frame_set_pkt_pos     (frame, avctx->internal->pkt->pos);
-        av_frame_set_pkt_duration(frame, avctx->internal->pkt->duration);
-        av_frame_set_pkt_size    (frame, avctx->internal->pkt->size);
+        frame->pkt_pts = pkt->pts;
+        av_frame_set_pkt_pos     (frame, pkt->pos);
+        av_frame_set_pkt_duration(frame, pkt->duration);
+        av_frame_set_pkt_size    (frame, pkt->size);
 
         /* copy the replaygain data to the output frame */
-        packet_sd = av_packet_get_side_data(avctx->internal->pkt, AV_PKT_DATA_REPLAYGAIN, &size);
+        packet_sd = av_packet_get_side_data(pkt, AV_PKT_DATA_REPLAYGAIN, &size);
         if (packet_sd) {
             frame_sd = av_frame_new_side_data(frame, AV_FRAME_DATA_REPLAYGAIN, size);
             if (!frame_sd)