[FFmpeg-cvslog] avcodec/mjpegenc: Use av_frame_clone() instead of av_frame_ref()
Michael Niedermayer
git at videolan.org
Fri Jan 24 04:09:36 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 24 03:24:55 2014 +0100| [a26e9c1040afeecf9013da742b0dec7009445f2b] | committer: Michael Niedermayer
avcodec/mjpegenc: Use av_frame_clone() instead of av_frame_ref()
This avoids the need for double error checking
Fixes CID1163843
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a26e9c1040afeecf9013da742b0dec7009445f2b
---
libavcodec/mjpegenc.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c
index 44e1c3c..7487ef8 100644
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@@ -539,10 +539,9 @@ static int amv_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
if(s->avctx->flags & CODEC_FLAG_EMU_EDGE)
return AVERROR(EINVAL);
- pic = av_frame_alloc();
+ pic = av_frame_clone(pic_arg);
if (!pic)
return AVERROR(ENOMEM);
- av_frame_ref(pic, pic_arg);
//picture should be flipped upside-down
for(i=0; i < 3; i++) {
int vsample = i ? 2 >> chroma_v_shift : 2;
More information about the ffmpeg-cvslog
mailing list