avcodec/utils/ff_init_buffer_info factor avctx->internal->pkt; out
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 20:59:59 +0000 (22:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 20:59:59 +0000 (22:59 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/utils.c

index 444b9b2..b899392 100644 (file)
@@ -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)