diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-11-17 13:00:47 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-11-17 13:00:47 +0100 |
| commit | 55a424c5a836523828b3b2f02b7db610e898b3fc (patch) | |
| tree | 355184f6e53a52698153006f939c6205af742299 | |
| parent | f8247c0ccebc2a153eb76a82961e4f6ca81e6f82 (diff) | |
lavc/ffv1dec: Scale output for msb-packed compression to full 16bit.
2% slowdown for existing decode-line timer.
| -rw-r--r-- | libavcodec/ffv1dec.c | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index d8f35c34b9..0719e2822d 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -142,7 +142,7 @@ static void decode_plane(FFV1Context *s, uint8_t *src, } } else { for (x = 0; x < w; x++) { - ((uint16_t*)(src + stride*y))[x*pixel_stride] = sample[1][x] << (16 - s->avctx->bits_per_raw_sample); + ((uint16_t*)(src + stride*y))[x*pixel_stride] = sample[1][x] << (16 - s->avctx->bits_per_raw_sample) | ((uint16_t **)sample)[1][x] >> (2 * s->avctx->bits_per_raw_sample - 16); } } } diff --git a/libavcodec/version.h b/libavcodec/version.h index b5e9ad77ac..d7819e403c 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 66 -#define LIBAVCODEC_VERSION_MICRO 104 +#define LIBAVCODEC_VERSION_MICRO 105 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |