diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-09 00:43:31 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-01-09 09:48:49 +0100 |
| commit | ddb0317154ce54b4aed15a5f58cb1fc1b7ea533b (patch) | |
| tree | a73a0c78ac8f54a9a024b285cdcdb968adf245cc | |
| parent | 606aa3baee1e85626f289b0864963e4c920eff8b (diff) | |
| download | ffmpeg-ddb0317154ce54b4aed15a5f58cb1fc1b7ea533b.tar.gz | |
dirac: fix inverted check
Regression since: ea6da80
Fixes Ticket2123
I cannot reproduce any regressions by flipping the wrong condition
to how it should have been.
Thanks-to: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 57bdd67646cfffa2921a8b28bb5f88cfe5c0989e)
| -rw-r--r-- | libavcodec/dirac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dirac.c b/libavcodec/dirac.c index 2dd754f752..e132acc44a 100644 --- a/libavcodec/dirac.c +++ b/libavcodec/dirac.c @@ -237,7 +237,7 @@ static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb, avctx->pix_fmt = dirac_pix_fmt[!luma_offset][source->chroma_format]; avcodec_get_chroma_sub_sample(avctx->pix_fmt, &chroma_x_shift, &chroma_y_shift); - if (!(source->width % (1<<chroma_x_shift)) || !(source->height % (1<<chroma_y_shift))) { + if ((source->width % (1<<chroma_x_shift)) || (source->height % (1<<chroma_y_shift))) { av_log(avctx, AV_LOG_ERROR, "Dimensions must be a integer multiply of the chroma subsampling\n"); return AVERROR_INVALIDDATA; } |