Michael Niedermayer
|
d9b264bc73
|
Merge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42'
* commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42':
mpegvideo: Drop flags and flags2
Conflicts:
libavcodec/mpeg12dec.c
libavcodec/mpeg12enc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/ratecontrol.c
libavcodec/vc1_block.c
libavcodec/vc1_loopfilter.c
libavcodec/vc1_mc.c
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2015-05-22 20:24:41 +02:00 |
|
Vittorio Giovara
|
848e86f74d
|
mpegvideo: Drop flags and flags2
They are just duplicates of AVCodecContext members so use those instead.
|
2015-05-22 15:34:39 +01:00 |
|
Carl Eugen Hoyos
|
83356cf6cc
|
lavc/vc1: Never decode vc1 as gray if gray decoding was not enabled.
|
2015-05-17 12:58:44 +02:00 |
|
Michael Niedermayer
|
982e7bbfa6
|
avcodec/vc1: Skip chroma operations if CODEC_FLAG_GRAY is set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2015-05-08 20:32:15 +02:00 |
|
Michael Niedermayer
|
51946d2de8
|
vc1: Use the correct shift amount
`is_intra` is a 6bits bitfield.
CC: libav-stable@libav.org
Bug-Id: CID 1194380 / CID 1194381
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
|
2014-11-25 02:00:06 +00:00 |
|
Michael Niedermayer
|
d5a3caef93
|
Merge commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576'
* commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576':
vc1: Split the decoder in components
Conflicts:
libavcodec/Makefile
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-10-08 22:00:09 +02:00 |
|
Luca Barbato
|
04d14c9b68
|
vc1: Split the decoder in components
Speed up the overall compilation time.
|
2014-10-08 18:34:48 +02:00 |
|