Skip to content

F
ffmpeg
Commit 8013574e authored by Andreas Rheinhardt's avatar Andreas Rheinhardt
Browse files
Options

avcodec/mjpegenc: Inline chroma subsampling 

Signed-off-by: 's avatarAndreas Rheinhardt <andreas.rheinhardt@outlook.com>
parent 0b212f35
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 5 deletions
libavcodec/mjpegenc.c
View file @ 8013574e
...@@ -32,8 +32,6 @@ ...@@ -32,8 +32,6 @@
#include "config_components.h" #include "config_components.h"
#include "libavutil/pixdesc.h"
#include "avcodec.h" #include "avcodec.h"
#include "codec_internal.h" #include "codec_internal.h"
#include "jpegtables.h" #include "jpegtables.h"
...@@ -595,9 +593,7 @@ static int amv_encode_picture(AVCodecContext *avctx, AVPacket *pkt, ...@@ -595,9 +593,7 @@ static int amv_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
MpegEncContext *s = avctx->priv_data; MpegEncContext *s = avctx->priv_data;
AVFrame *pic; AVFrame *pic;
int i, ret; int i, ret;
int chroma_h_shift, chroma_v_shift; int chroma_v_shift = 1; /* AMV is 420-only */
av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &chroma_h_shift, &chroma_v_shift);
if ((avctx->height & 15) && avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) { if ((avctx->height & 15) && avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment