This patch adds support for muxing VP8 Alpha Files. The Alpha channel data is
placed in BlockAdditional element of the matroska container. More information
& exact spec on how this is implemented can be found here: http://goo.gl/wCP1y
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* qatar/master:
mpegvideo: allocate sufficiently large scratch buffer for interlaced vid
Conflicts:
libavcodec/mpegvideo.c
See: 73db0bf1b0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '16a645adeb758207346a4bbf66766f02734c461e':
vf_pixdesctest: make config_props work properly when called multiple times.
vf_hqdn3d: make config_props work properly when called multiple times.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '3fb29588a27a711132106b924e27b53789a58dcb':
vf_drawtext: don't leak the expressions.
vf_crop: make config_props work properly when called multiple times.
vf_setdar: make config_props work properly when called multiple times.
Conflicts:
libavfilter/vf_aspect.c
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '4c205f42c86ccefa093c59434669af34ad14a52b':
vf_drawbox: make config_props work properly when called multiple times.
vf_drawtext: do not reset the frame number in config_input.
vf_fps: move initializing pts from config_props to init.
Conflicts:
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'd371c3c2e2830d9783465ecfe1ab7d93351083b7':
vf_frei0r: make config_props work properly when called multiple times.
vf_gradfun: make config_props work properly when called multiple times.
vf_lut: make config_props work properly when called multiple times.
Conflicts:
libavfilter/vf_lut.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '1fb013a57c6d98d3f425506eb25f32b2cf7ddc6f':
vc1dec: Add support for interlaced B-frames
Conflicts:
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
According to the PIFF specification[1] the base_data_offset field MUST be
omitteed. See section 5.2.17. Since the ISMV files created by ffmpeg state
that they are 'piff' compatible via 'ftyp' box, this needs to be corrected.
[1] http://www.iis.net/learn/media/smooth-streaming/protected-interoperable-file-format
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
MPV_decode_mb_internal needs 3 * 16 * linesize bytes of scratch buffer
For interlaced content, linesize is multiplied by two after the allocation
of the scratch buffer, and the dest_cr pointer ends past the buffer.
This patch makes ff_mpv_frame_size_alloc allocate a total of
(aligned line_size) * 2 * 16 * 3 bytes, which suffices even for the
interlaced case.
CC:libav-stable@libav.org
Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Those were useful when avcodec_thread_init() was a public functions. It
was deprecated and removed some time ago, so those checks are not needed
anymore.
According to the PIFF specification[1] the base_data_offset field MUST be
omitteed. See section 5.2.17. Since the ISMV files created by libavformat
state that they are 'piff' compatible via 'ftyp' box, this needs to be
corrected.
[1] http://www.iis.net/learn/media/smooth-streaming/protected-interoperable-file-format
Signed-off-by: Martin Storsjö <martin@martin.st>
* qatar/master:
sparc: Eliminate dead code in VIS acceleration macros
flacdec: drop unnecessary assert
mjpegdec: properly report unsupported disabled features
Conflicts:
libavcodec/flacdec.c
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* qatar/master:
vf_pad: use the name 's' for the pointer to the private context
vf_overlay: use the name 's' for the pointer to the private context
vf_lut: use the name 's' for the pointer to the private context
Conflicts:
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '4753f802c00853859b7b4b8fdb79c35e082cb7f8':
vf_libopencv: use the name 's' for the pointer to the private context
vf_hqdn3d: use the name 's' for the pointer to the private context
vf_hflip: use the name 's' for the pointer to the private context
vf_gradfun: use the name 's' for the pointer to the private context
Conflicts:
libavfilter/vf_gradfun.c
libavfilter/vf_hflip.c
libavfilter/vf_hqdn3d.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
