Merge commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e'

* commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e': roqvideoenc: Drop unneeded initialization Conflicts: libavcodec/roqvideoenc.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago · 6497aab022
parent 16b68bd2ee 95e2317ed8
commit 6497aab022
1 changed files with 0 additions and 3 deletions
--- a/libavcodec/roqvideoenc.c
+++ b/libavcodec/roqvideoenc.c
@ -960,9 +960,6 @@ static int roq_encode_video(RoqContext *enc)
    reconstruct_and_encode_image(enc, tempData, enc->width, enc->height,
                                 enc->width*enc->height/64);

-    av_frame_unref(enc->avctx->coded_frame);
-    av_frame_ref(enc->avctx->coded_frame, enc->current_frame);
-
    /* Rotate frame history */
    FFSWAP(AVFrame *, enc->current_frame, enc->last_frame);
    FFSWAP(motion_vect *, enc->last_motion4, enc->this_motion4);