ffmpeg.git
6 years agoMerge commit 'f713411d4cfbd9c467aeda77b16ca6bc4db55d10'
Michael Niedermayer [Tue, 29 Jan 2013 12:57:57 +0000 (13:57 +0100)]
Merge commit 'f713411d4cfbd9c467aeda77b16ca6bc4db55d10'

* commit 'f713411d4cfbd9c467aeda77b16ca6bc4db55d10':
  mdec: cosmetics, reformat

Conflicts:
libavcodec/mdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '098eed95bc1a6b2c8ac97f126f62bb74699670cf'
Michael Niedermayer [Tue, 29 Jan 2013 12:48:26 +0000 (13:48 +0100)]
Merge commit '098eed95bc1a6b2c8ac97f126f62bb74699670cf'

* commit '098eed95bc1a6b2c8ac97f126f62bb74699670cf':
  mdec: merge mdec_common_init() into decode_init().
  eatgv: use fixed-width types where appropriate.
  x86: Simplify some arch conditionals
  bfin: Separate VP3 initialization code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f550583c00e231b587d8ef98451cfbb6b6561eb6'
Michael Niedermayer [Tue, 29 Jan 2013 12:40:36 +0000 (13:40 +0100)]
Merge commit 'f550583c00e231b587d8ef98451cfbb6b6561eb6'

* commit 'f550583c00e231b587d8ef98451cfbb6b6561eb6':
  bfin: update VP3 idct

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: move deprecated audio_resample* bellow
Paul B Mahol [Mon, 28 Jan 2013 22:59:15 +0000 (22:59 +0000)]
lavc: move deprecated audio_resample* bellow

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agomdec: cosmetics, reformat
Anton Khirnov [Sun, 9 Dec 2012 17:52:55 +0000 (18:52 +0100)]
mdec: cosmetics, reformat

6 years agomdec: merge mdec_common_init() into decode_init().
Anton Khirnov [Sun, 9 Dec 2012 17:44:44 +0000 (18:44 +0100)]
mdec: merge mdec_common_init() into decode_init().

There is no point in keeping those two functions separate.

6 years agoeatgv: use fixed-width types where appropriate.
Anton Khirnov [Wed, 21 Nov 2012 13:55:05 +0000 (14:55 +0100)]
eatgv: use fixed-width types where appropriate.

6 years agoh264: check the pixel format directly and force a reinit on mismatches.
Michael Niedermayer [Tue, 29 Jan 2013 03:17:48 +0000 (04:17 +0100)]
h264: check the pixel format directly and force a reinit on mismatches.

The existing checks are insufficient to detect a pixel format
changes in case of some damaged streams.
Fixes inconsistency and later out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoiff/deep: fix rle32 on big-endian
Piotr Bandurski [Tue, 29 Jan 2013 00:01:13 +0000 (11:01 +1100)]
iff/deep: fix rle32 on big-endian

Fixes ticket #2197.

Signed-off-by: Peter Ross <pross@xvid.org>
6 years agox86: Simplify some arch conditionals
Diego Biurrun [Sat, 26 Jan 2013 11:19:34 +0000 (12:19 +0100)]
x86: Simplify some arch conditionals

6 years agotakdec: switch to init_get_bits8()
Paul B Mahol [Mon, 28 Jan 2013 22:47:30 +0000 (22:47 +0000)]
takdec: switch to init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agowmavoicedec: use the checked bitstream, reader
Michael Niedermayer [Mon, 28 Jan 2013 22:12:24 +0000 (23:12 +0100)]
wmavoicedec: use the checked bitstream, reader

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp3dec: move threads check out of header packet type check
Michael Niedermayer [Mon, 28 Jan 2013 21:43:30 +0000 (22:43 +0100)]
vp3dec: move threads check out of header packet type check

Prevents reconfiguration with threads which is unsupported
and would bring the contexts into an inconsistent state.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter_get_audio_buffer_ref_from_frame: fix handling of >8 channels
Michael Niedermayer [Mon, 28 Jan 2013 20:44:25 +0000 (21:44 +0100)]
avfilter_get_audio_buffer_ref_from_frame: fix handling of >8 channels

Found-by: inferno@chromium.org
Reported-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobfin: Separate VP3 initialization code
Diego Biurrun [Mon, 28 Jan 2013 19:22:54 +0000 (20:22 +0100)]
bfin: Separate VP3 initialization code

6 years agobfin: update VP3 idct
Luca Barbato [Mon, 28 Jan 2013 19:19:07 +0000 (20:19 +0100)]
bfin: update VP3 idct

The block must be set to 0.

6 years agodirac/x86: Fix handling blocksizes that are not a multiple of 4
Michael Niedermayer [Mon, 28 Jan 2013 19:40:13 +0000 (20:40 +0100)]
dirac/x86: Fix handling blocksizes that are not a multiple of 4

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodirac: Only use MMX if MMX is available.
Michael Niedermayer [Mon, 28 Jan 2013 19:00:55 +0000 (20:00 +0100)]
dirac: Only use MMX if MMX is available.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoqdm2: increase noise_table size
Michael Niedermayer [Mon, 28 Jan 2013 18:34:55 +0000 (19:34 +0100)]
qdm2: increase noise_table size

This prevents out of array reads. An alternative solution would be
to check the index but this would require several checks in the
inner loops

Yet another alternative would be to change the index reset logic
but this likely would introduce a difference to the binary decoder

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoalsdec/read_specific_config: check for init_get_bits failure
Michael Niedermayer [Sun, 27 Jan 2013 21:36:37 +0000 (22:36 +0100)]
alsdec/read_specific_config: check for init_get_bits failure

This also fixes a potential integer overflow

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Thilo Borgmann <thilo.borgmann@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 28 Jan 2013 13:25:19 +0000 (14:25 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: hpeldsp: Fix a typo, use the right register
  shorten: fix array subscript is below array bounds warning

Conflicts:
libavcodec/shorten.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '05b0998f511ffa699407465d48c7d5805f746ad2'
Michael Niedermayer [Mon, 28 Jan 2013 13:06:22 +0000 (14:06 +0100)]
Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2'

* commit '05b0998f511ffa699407465d48c7d5805f746ad2':
  dsputil: Fix error by not using redzone and register name
  swscale: GBRP output support

Conflicts:
libswscale/output.c
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/utils.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaasc: fix 16bpp on big-endian
Piotr Bandurski [Mon, 28 Jan 2013 11:29:37 +0000 (11:29 +0000)]
aasc: fix 16bpp on big-endian

6 years agox86: hpeldsp: Fix a typo, use the right register
Michael Niedermayer [Sun, 27 Jan 2013 14:50:26 +0000 (15:50 +0100)]
x86: hpeldsp: Fix a typo, use the right register

This makes the code actually work.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoshorten: fix array subscript is below array bounds warning
Luca Barbato [Mon, 28 Jan 2013 06:24:51 +0000 (07:24 +0100)]
shorten: fix array subscript is below array bounds warning

Incidentally fixes alpha builds.

6 years agodsputil: Fix error by not using redzone and register name
Daniel Kang [Sun, 27 Jan 2013 20:28:58 +0000 (20:28 +0000)]
dsputil: Fix error by not using redzone and register name

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agolavd/v4l2: use avcodec_find_decoder in list_formats
Stephan Hilb [Sun, 27 Jan 2013 11:17:39 +0000 (12:17 +0100)]
lavd/v4l2: use avcodec_find_decoder in list_formats

Because libavdevice/v4l2 is a demuxer, it makes sense to look for
decoders instead of encoders when listing the formats supported by the
device.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agomjpegdec: rgb mode is specific for ljpeg, disable it for others.
Michael Niedermayer [Sun, 27 Jan 2013 22:45:44 +0000 (23:45 +0100)]
mjpegdec: rgb mode is specific for ljpeg, disable it for others.

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaacdec: check init_get_bits return
Michael Niedermayer [Sun, 27 Jan 2013 21:44:29 +0000 (22:44 +0100)]
aacdec: check init_get_bits return

Also fixes an integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomjpegdec: fix memcmp size for *_count
Michael Niedermayer [Sun, 27 Jan 2013 20:52:24 +0000 (21:52 +0100)]
mjpegdec: fix memcmp size for *_count

Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoWrite forced track flag to matroska files.
Carl Eugen Hoyos [Sun, 27 Jan 2013 22:24:52 +0000 (23:24 +0100)]
Write forced track flag to matroska files.

Based on a patch by Daniel Pielmeier, daniel pielmeier gmail
Fixes a part of ticket #1815.

6 years agoFix some avi rawvideo formats on big endian.
Carl Eugen Hoyos [Sun, 27 Jan 2013 21:49:48 +0000 (22:49 +0100)]
Fix some avi rawvideo formats on big endian.

Fixes ticket #2196.

6 years agoswscale: GBRP output support
Michael Niedermayer [Fri, 25 Jan 2013 20:51:25 +0000 (21:51 +0100)]
swscale: GBRP output support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoavpriv_mpeg4audio_get_config: check init_get_bits() return code.
Michael Niedermayer [Sun, 27 Jan 2013 20:17:32 +0000 (21:17 +0100)]
avpriv_mpeg4audio_get_config: check init_get_bits() return code.

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaacdec: check channel count
Michael Niedermayer [Sun, 27 Jan 2013 19:37:27 +0000 (20:37 +0100)]
aacdec: check channel count

Prevent out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/dnxhdenc: print valid profiles when codec parameters are invalid
Matthieu Bouron [Sat, 26 Jan 2013 11:46:01 +0000 (12:46 +0100)]
lavc/dnxhdenc: print valid profiles when codec parameters are invalid

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/dnxhddata: add frame_rates field to cid table
Matthieu Bouron [Sat, 26 Jan 2013 11:45:59 +0000 (12:45 +0100)]
lavc/dnxhddata: add frame_rates field to cid table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd/v4l2: select input immediately after opening the device
Giorgio Vazzana [Sat, 26 Jan 2013 12:37:37 +0000 (13:37 +0100)]
lavd/v4l2: select input immediately after opening the device

After opening the device, the first thing we should do is selecting the
input. This is because the image formats (VIDIOC_ENUM_FMT ioctl) and the
standards (VIDIOC_ENUMSTD ioctl) supported may depend on the selected
input ([1] and [2]).

[1] http://linuxtv.org/downloads/v4l-dvb-apis/vidioc-enum-fmt.html
[2] http://linuxtv.org/downloads/v4l-dvb-apis/vidioc-enumstd.html

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agolavd/v4l2: sanitize logic of device_try_init(), so that it properly signal errors
Stefano Sabatini [Tue, 15 Jan 2013 11:45:13 +0000 (12:45 +0100)]
lavd/v4l2: sanitize logic of device_try_init(), so that it properly signal errors

Make device_try_init() return an error value, and allow to properly
report errors which are not due to a wrong pixel/codec configuration.

In particular, report intelligible feedback in case of busy device.

6 years agoffmpeg: remove -crop* and -pad* options
Stefano Sabatini [Sat, 26 Jan 2013 11:56:36 +0000 (12:56 +0100)]
ffmpeg: remove -crop* and -pad* options

The options have been deprecated and are non-operational since more than
two years.

6 years agoffmpeg: implement -force_key_frames expression evalution
Stefano Sabatini [Sun, 9 Dec 2012 17:40:22 +0000 (18:40 +0100)]
ffmpeg: implement -force_key_frames expression evalution

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 27 Jan 2013 15:47:50 +0000 (16:47 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: vp8: Fix the plain-armv6 version of vp8_luma_dc_wht

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '96753bd00d6d4046db6818c0aadc21bf2a11d77b'
Michael Niedermayer [Sun, 27 Jan 2013 15:29:57 +0000 (16:29 +0100)]
Merge commit '96753bd00d6d4046db6818c0aadc21bf2a11d77b'

* commit '96753bd00d6d4046db6818c0aadc21bf2a11d77b':
  dsputil: x86: Correct the number of registers used in put_no_rnd_pixels16_l2
  dsputil: add missing HAVE_YASM guard
  hwaccel: do not offer unsupported pixel formats
  vdpau: add missing pixel format for H.264

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAVG_PIXELS8_XY2: fix typo, make code actually work
Michael Niedermayer [Sun, 27 Jan 2013 14:50:26 +0000 (15:50 +0100)]
AVG_PIXELS8_XY2: fix typo, make code actually work

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodsputil: x86: Correct the number of registers used in put_no_rnd_pixels16_l2
Daniel Kang [Sun, 27 Jan 2013 07:22:54 +0000 (02:22 -0500)]
dsputil: x86: Correct the number of registers used in put_no_rnd_pixels16_l2

put_no_rnd_pixels16_l2 allocated 5 instead of 6 registers.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agodsputil: add missing HAVE_YASM guard
Daniel Kang [Sun, 27 Jan 2013 07:14:53 +0000 (02:14 -0500)]
dsputil: add missing HAVE_YASM guard

Fix compile error under
"--disable-optimizations --disable-yasm --disable-inline-asm"

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agox86/mpeg4qpel: Fix author attribution
Michael Niedermayer [Sun, 27 Jan 2013 14:07:02 +0000 (15:07 +0100)]
x86/mpeg4qpel: Fix author attribution

Also fix project name

See git blame/log/show and
commit 826f429ae9990632a04b06bd375afa54ffe54b76
Author: Michael Niedermayer <michaelni@gmx.at>
Date:   Sun Jan 5 15:57:10 2003 +0000

    qpel in mmx2/3dnow
    qpel refinement quality parameter

    Originally committed as revision 1393 to svn://svn.ffmpeg.org/ffmpeg/trunk

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/hpeldsp: Fix author attribution
Michael Niedermayer [Sun, 27 Jan 2013 13:45:19 +0000 (14:45 +0100)]
x86/hpeldsp: Fix author attribution

This also fixes the project name

Original authors fabrice and nick go back to the initial ffmpeg commit
Others for example contributed in: (for a complete list please use git blame / show / log)

commit e9c0a38ff0a9d4754220ae3432b2cdebe5a1c781
Author: Zdenek Kabelac <kabi@informatics.muni.cz>
Date:   Tue May 28 16:35:58 2002 +0000

    * optimized avg_* functions (except xy2)
    * minor speedup for put_pixels_x2 & cleanup

    Originally committed as revision 619 to svn://svn.ffmpeg.org/ffmpeg/trunk

commit 607dce96c0225e30ae2e7f3b8de2d00b4f064805
Author: Michael Niedermayer <michaelni@gmx.at>
Date:   Fri May 17 01:04:14 2002 +0000

    hopefully faster mmx2&3dnow MC

    Originally committed as revision 506 to svn://svn.ffmpeg.org/ffmpeg/trunk

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '71155d7b4157fee44c0d3d0fc1b660ebfb9ccf46'
Michael Niedermayer [Sun, 27 Jan 2013 12:49:57 +0000 (13:49 +0100)]
Merge commit '71155d7b4157fee44c0d3d0fc1b660ebfb9ccf46'

* commit '71155d7b4157fee44c0d3d0fc1b660ebfb9ccf46':
  dsputil: x86: Convert mpeg4 qpel and dsputil avg to yasm

Conflicts:
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f90ff772e7e35b4923c2de429d1fab9f2569b568'
Michael Niedermayer [Sun, 27 Jan 2013 12:32:47 +0000 (13:32 +0100)]
Merge commit 'f90ff772e7e35b4923c2de429d1fab9f2569b568'

* commit 'f90ff772e7e35b4923c2de429d1fab9f2569b568':
  Move H264/QPEL specific asm from dsputil.asm to h264_qpel_*.asm.
  doc: update the reference for the title

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/srtdec: do not try to queue empty subtitle chunks.
Clément Bœsch [Sun, 27 Jan 2013 11:25:21 +0000 (20:25 +0900)]
lavf/srtdec: do not try to queue empty subtitle chunks.

Regression since 3af3a30.
Fixes Ticket2167.

6 years agoarm: vp8: Fix the plain-armv6 version of vp8_luma_dc_wht
Martin Storsjö [Fri, 25 Jan 2013 21:16:23 +0000 (23:16 +0200)]
arm: vp8: Fix the plain-armv6 version of vp8_luma_dc_wht

This makes the plain-armv6 version use the same registers as the
armv6t2 version above.

This fixes fate-vp8 on plain-armv6 devices.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavc/iff: rgbn: fix decoding on big endian
Paul B Mahol [Sat, 26 Jan 2013 14:37:08 +0000 (14:37 +0000)]
lavc/iff: rgbn: fix decoding on big endian

Fixes #2193.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodsputil: x86: Correct the number of registers used in put_no_rnd_pixels16_l2
Daniel Kang [Sun, 27 Jan 2013 07:22:54 +0000 (02:22 -0500)]
dsputil: x86: Correct the number of registers used in put_no_rnd_pixels16_l2

put_no_rnd_pixels16_l2 allocated 5 instead of 6 registers.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agodsputil: add missing HAVE_YASM guard
Daniel Kang [Sun, 27 Jan 2013 07:14:53 +0000 (02:14 -0500)]
dsputil: add missing HAVE_YASM guard

Fix compile error under
"--disable-optimizations --disable-yasm --disable-inline-asm"

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agohwaccel: do not offer unsupported pixel formats
Rémi Denis-Courmont [Sat, 26 Jan 2013 20:47:55 +0000 (22:47 +0200)]
hwaccel: do not offer unsupported pixel formats

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agovdpau: add missing pixel format for H.264
Rémi Denis-Courmont [Sat, 26 Jan 2013 20:47:54 +0000 (22:47 +0200)]
vdpau: add missing pixel format for H.264

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agodsputil: x86: Convert mpeg4 qpel and dsputil avg to yasm
Daniel Kang [Sun, 27 Jan 2013 03:45:43 +0000 (03:45 +0000)]
dsputil: x86: Convert mpeg4 qpel and dsputil avg to yasm

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoswr/ build_filter: use av_calloc() fix buffer overflow
Michael Niedermayer [Sun, 27 Jan 2013 04:57:58 +0000 (05:57 +0100)]
swr/ build_filter: use av_calloc() fix buffer overflow

Fixes integer & buffer overflow

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: limit phase_shift to a less insane value.
Michael Niedermayer [Sun, 27 Jan 2013 04:54:52 +0000 (05:54 +0100)]
swr: limit phase_shift to a less insane value.

This prevents potential crashes and out of memory issues if
the user manually sets such insane values.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMove H264/QPEL specific asm from dsputil.asm to h264_qpel_*.asm.
Ronald S. Bultje [Fri, 25 Jan 2013 06:21:12 +0000 (22:21 -0800)]
Move H264/QPEL specific asm from dsputil.asm to h264_qpel_*.asm.

6 years agotiff: in add_string_metadata() check the count more completely
Michael Niedermayer [Sun, 27 Jan 2013 03:53:03 +0000 (04:53 +0100)]
tiff: in add_string_metadata() check the count more completely

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomvdec: check var_read_string() return value
Michael Niedermayer [Sun, 27 Jan 2013 01:14:38 +0000 (02:14 +0100)]
mvdec: check var_read_string() return value

Prevent null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomvdec: Check the frame counter against the correct limit.
Michael Niedermayer [Sun, 27 Jan 2013 01:08:22 +0000 (02:08 +0100)]
mvdec: Check the frame counter against the correct limit.

fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosws: disable yuv2rgb warning for planar rgb.
Michael Niedermayer [Sat, 26 Jan 2013 22:05:26 +0000 (23:05 +0100)]
sws: disable yuv2rgb warning for planar rgb.

planar rgb formats do not use the table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosws: include isRGB in isAnyRGB() so that future RGB formats wont be missed again
Michael Niedermayer [Sat, 26 Jan 2013 19:49:25 +0000 (20:49 +0100)]
sws: include isRGB in  isAnyRGB() so that future RGB formats wont be missed again

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosws: add planar RGB formats to isAnyRGB
Michael Niedermayer [Sat, 26 Jan 2013 18:50:28 +0000 (19:50 +0100)]
sws: add planar RGB formats to isAnyRGB

We have to make some symetric changes elsewhere as this increases
the precission with which samples are stored.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosws: dont enable chrSrcHSubSample for planar RGB
Michael Niedermayer [Sat, 26 Jan 2013 18:49:22 +0000 (19:49 +0100)]
sws: dont enable chrSrcHSubSample for planar RGB

This code path is not implemented and makes not much sense to implement
either.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosws: use planarRgbToRgbWrapper only for 8bit per component
Michael Niedermayer [Sat, 26 Jan 2013 18:43:06 +0000 (19:43 +0100)]
sws: use planarRgbToRgbWrapper only for 8bit per component

The function doesnt support >8bit currently

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 26 Jan 2013 14:53:58 +0000 (15:53 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo_enc: fix indentation in load_input_picture()

Conflicts:
libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3f47d316cda9037024ffbc76f789332e62b729bc'
Michael Niedermayer [Sat, 26 Jan 2013 14:46:35 +0000 (15:46 +0100)]
Merge commit '3f47d316cda9037024ffbc76f789332e62b729bc'

* commit '3f47d316cda9037024ffbc76f789332e62b729bc':
  mpegvideo_enc: do not modify the input frame.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7bcaeb408e3eb2d2f37a306009fa7fe7eb0f1d79'
Michael Niedermayer [Sat, 26 Jan 2013 14:42:29 +0000 (15:42 +0100)]
Merge commit '7bcaeb408e3eb2d2f37a306009fa7fe7eb0f1d79'

* commit '7bcaeb408e3eb2d2f37a306009fa7fe7eb0f1d79':
  mjpegdec: fix indentation
  rawdec: cosmetics, reformat
  mimic: return meaningful error codes.

Conflicts:
libavcodec/mjpegdec.c
libavcodec/rawdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a0cabd0a27587525e90a44660c795d40d2f44fe2'
Michael Niedermayer [Sat, 26 Jan 2013 14:19:48 +0000 (15:19 +0100)]
Merge commit 'a0cabd0a27587525e90a44660c795d40d2f44fe2'

* commit 'a0cabd0a27587525e90a44660c795d40d2f44fe2':
  mimic: cosmetics, reformat
  iff: drop ff_ prefix from a static function.
  pngdec: cosmetics, reformat.
  dxa: return meaningful error codes.
  eatgq: cosmetics, reformat.

Conflicts:
libavcodec/dxa.c
libavcodec/eatgq.c
libavcodec/iff.c
libavcodec/mimic.c
libavcodec/pngdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/texi2pod: fix warnings introduced in e7e14bc69a606a6bec82efef729263cd38f122d4
Stefano Sabatini [Sat, 26 Jan 2013 14:10:55 +0000 (15:10 +0100)]
doc/texi2pod: fix warnings introduced in e7e14bc69a606a6bec82efef729263cd38f122d4

The variable "$section" was replaced by "$chapter".

6 years agoremove av_strnstr from Changelog
Paul B Mahol [Sat, 26 Jan 2013 14:04:30 +0000 (14:04 +0000)]
remove av_strnstr from Changelog

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodoc: update the reference for the title
Luca Barbato [Wed, 23 Jan 2013 16:11:42 +0000 (17:11 +0100)]
doc: update the reference for the title

The recent texi2html exports the title as 'fulltitle_no_texi'.

6 years agoMerge commit 'f337c29017b10c98ccb4dce20efced4c74b665f6'
Michael Niedermayer [Sat, 26 Jan 2013 13:47:08 +0000 (14:47 +0100)]
Merge commit 'f337c29017b10c98ccb4dce20efced4c74b665f6'

* commit 'f337c29017b10c98ccb4dce20efced4c74b665f6':
  eatgq: return meaningful error codes.
  eatgv: cosmetics, reformat

Conflicts:
libavcodec/eatgq.c
libavcodec/eatgv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ade402804a0e811cd00862c90559121a793054a6'
Michael Niedermayer [Sat, 26 Jan 2013 13:39:02 +0000 (14:39 +0100)]
Merge commit 'ade402804a0e811cd00862c90559121a793054a6'

* commit 'ade402804a0e811cd00862c90559121a793054a6':
  eatgv: return meaningful error codes.
  cyuv: return meaningful error codes.
  txd: return meaningful error codes.

Conflicts:
libavcodec/cyuv.c
libavcodec/eatgv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '69c25c9284645cf5189af2ede42d6f53828f3b45'
Michael Niedermayer [Sat, 26 Jan 2013 13:33:06 +0000 (14:33 +0100)]
Merge commit '69c25c9284645cf5189af2ede42d6f53828f3b45'

* commit '69c25c9284645cf5189af2ede42d6f53828f3b45':
  dnxhdenc: fix invalid reads in dnxhd_mb_var_thread().
  x86: h264qpel: Move stray comment to the right spot and clarify it
  atrac3: use correct loop variable in add_tonal_components()

Conflicts:
tests/ref/vsynth/vsynth1-dnxhd-1080i
tests/ref/vsynth/vsynth2-dnxhd-1080i

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ded3673d77943c376d94e8157b1238bbd1eeca2d'
Michael Niedermayer [Sat, 26 Jan 2013 13:18:48 +0000 (14:18 +0100)]
Merge commit 'ded3673d77943c376d94e8157b1238bbd1eeca2d'

* commit 'ded3673d77943c376d94e8157b1238bbd1eeca2d':
  doc: document libx264 options and mappings
  libx264: introduce -x264-params private option

Conflicts:
doc/encoders.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '38c1466ca41c73c7ce347da702362cb69c151716'
Michael Niedermayer [Sat, 26 Jan 2013 12:34:30 +0000 (13:34 +0100)]
Merge commit '38c1466ca41c73c7ce347da702362cb69c151716'

* commit '38c1466ca41c73c7ce347da702362cb69c151716':
  dict: add av_dict_parse_string()
  doc: support multitable in texi2pod

Conflicts:
doc/APIchanges
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo_enc: fix indentation in load_input_picture()
Anton Khirnov [Mon, 7 Jan 2013 06:46:01 +0000 (07:46 +0100)]
mpegvideo_enc: fix indentation in load_input_picture()

6 years agompegvideo_enc: do not modify the input frame.
Anton Khirnov [Mon, 7 Jan 2013 06:07:20 +0000 (07:07 +0100)]
mpegvideo_enc: do not modify the input frame.

6 years agomjpegdec: fix indentation
Anton Khirnov [Sun, 6 Jan 2013 15:50:29 +0000 (16:50 +0100)]
mjpegdec: fix indentation

6 years agorawdec: cosmetics, reformat
Anton Khirnov [Thu, 3 Jan 2013 16:02:38 +0000 (17:02 +0100)]
rawdec: cosmetics, reformat

6 years agomimic: return meaningful error codes.
Anton Khirnov [Wed, 26 Dec 2012 09:35:16 +0000 (10:35 +0100)]
mimic: return meaningful error codes.

6 years agomimic: cosmetics, reformat
Anton Khirnov [Wed, 26 Dec 2012 09:11:12 +0000 (10:11 +0100)]
mimic: cosmetics, reformat

6 years agoiff: drop ff_ prefix from a static function.
Anton Khirnov [Sat, 8 Dec 2012 14:20:46 +0000 (15:20 +0100)]
iff: drop ff_ prefix from a static function.

6 years agopngdec: cosmetics, reformat.
Anton Khirnov [Sat, 8 Dec 2012 11:58:46 +0000 (12:58 +0100)]
pngdec: cosmetics, reformat.

Also remove a commented out line.

6 years agodxa: return meaningful error codes.
Anton Khirnov [Fri, 16 Nov 2012 13:02:08 +0000 (14:02 +0100)]
dxa: return meaningful error codes.

6 years agoeatgq: cosmetics, reformat.
Anton Khirnov [Wed, 21 Nov 2012 18:26:41 +0000 (19:26 +0100)]
eatgq: cosmetics, reformat.

6 years agolavc/iff: ilbm: unbreak decoding on big endian
Paul B Mahol [Sat, 26 Jan 2013 11:58:36 +0000 (11:58 +0000)]
lavc/iff: ilbm: unbreak decoding on big endian

Fixes #2192.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoeatgq: return meaningful error codes.
Anton Khirnov [Wed, 21 Nov 2012 18:20:21 +0000 (19:20 +0100)]
eatgq: return meaningful error codes.

6 years agoeatgv: cosmetics, reformat
Anton Khirnov [Wed, 21 Nov 2012 13:52:54 +0000 (14:52 +0100)]
eatgv: cosmetics, reformat

6 years agoeatgv: return meaningful error codes.
Anton Khirnov [Wed, 21 Nov 2012 09:26:55 +0000 (10:26 +0100)]
eatgv: return meaningful error codes.

6 years agocyuv: return meaningful error codes.
Anton Khirnov [Tue, 20 Nov 2012 11:10:13 +0000 (12:10 +0100)]
cyuv: return meaningful error codes.

6 years agotxd: return meaningful error codes.
Anton Khirnov [Tue, 20 Nov 2012 06:48:01 +0000 (07:48 +0100)]
txd: return meaningful error codes.

6 years agolavfi/vf_drawtext: default to expansion=normal.
Nicolas George [Thu, 17 Jan 2013 11:17:35 +0000 (12:17 +0100)]
lavfi/vf_drawtext: default to expansion=normal.

6 years agodnxhdenc: fix invalid reads in dnxhd_mb_var_thread().
Anton Khirnov [Tue, 22 Jan 2013 10:55:54 +0000 (11:55 +0100)]
dnxhdenc: fix invalid reads in dnxhd_mb_var_thread().

Do not assume that frame dimensions are mod16 (or that height is mod32
for interlaced).

CC:libav-stable@libav.org

6 years agofate: add an attachment to the Matroska test.
Nicolas George [Tue, 1 Jan 2013 11:08:32 +0000 (12:08 +0100)]
fate: add an attachment to the Matroska test.