diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-26 14:35:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-26 15:19:35 +0100 |
| commit | 39d178806d9111e0e4a1e9400d4df0d00093ad00 (patch) | |
| tree | 54c65a1fac9a8b7b71340e96af4ff22e291a2ffb | |
| parent | 075eaf8d6afcbce4a17380231c80a1c945e53239 (diff) | |
| parent | 1f4ea4e068f1131bff6c246308f52acbf1347cc2 (diff) | |
| download | ffmpeg-39d178806d9111e0e4a1e9400d4df0d00093ad00.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: initialize videodsp with correct pixel depth
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpegvideo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index d60d4fcd68..4609b0b731 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -172,7 +172,7 @@ const uint8_t *avpriv_mpv_find_start_code(const uint8_t *av_restrict p, av_cold int ff_dct_common_init(MpegEncContext *s) { ff_dsputil_init(&s->dsp, s->avctx); - ff_videodsp_init(&s->vdsp, s->avctx->bits_per_raw_sample > 8 ? 16 : 8); + ff_videodsp_init(&s->vdsp, s->avctx->bits_per_raw_sample); s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_c; s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_c; |