diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 21:31:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 21:31:42 +0200 |
| commit | 6497aab022bf791f43a22d1ef2171994ef8e8980 (patch) | |
| tree | fdb8bd4bd0967cae653c611ab111512111eca97f /libavcodec/roqvideoenc.c | |
| parent | 16b68bd2ee5f36194b0bd9accc87a62a4b6048d2 (diff) | |
| parent | 95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e (diff) | |
| download | android_external_ffmpeg-6497aab022bf791f43a22d1ef2171994ef8e8980.tar.gz android_external_ffmpeg-6497aab022bf791f43a22d1ef2171994ef8e8980.tar.bz2 android_external_ffmpeg-6497aab022bf791f43a22d1ef2171994ef8e8980.zip | |
Merge commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e'
* commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e':
roqvideoenc: Drop unneeded initialization
Conflicts:
libavcodec/roqvideoenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/roqvideoenc.c')
| -rw-r--r-- | libavcodec/roqvideoenc.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c index 89879e81b3..157719a4dc 100644 --- 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); |