ffmpeg.git
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.

6 years agolavfi: version bump and change log entries after the last commits.
Nicolas George [Sat, 26 Jan 2013 10:25:21 +0000 (11:25 +0100)]
lavfi: version bump and change log entries after the last commits.

6 years agox86: h264qpel: Move stray comment to the right spot and clarify it
Diego Biurrun [Thu, 24 Jan 2013 16:01:32 +0000 (17:01 +0100)]
x86: h264qpel: Move stray comment to the right spot and clarify it

6 years agoffmpeg: support filtering of unknown channel layouts.
Nicolas George [Wed, 26 Dec 2012 15:53:02 +0000 (16:53 +0100)]
ffmpeg: support filtering of unknown channel layouts.

6 years agolavfi/af_anull: accept unknown channel layouts.
Nicolas George [Wed, 26 Dec 2012 15:52:15 +0000 (16:52 +0100)]
lavfi/af_anull: accept unknown channel layouts.

6 years agolavfi/af_aresample: accept unknown channel layouts.
Nicolas George [Wed, 26 Dec 2012 15:51:50 +0000 (16:51 +0100)]
lavfi/af_aresample: accept unknown channel layouts.

6 years agolavfi/af_aformat: accept unknown channel layouts.
Nicolas George [Wed, 26 Dec 2012 15:51:26 +0000 (16:51 +0100)]
lavfi/af_aformat: accept unknown channel layouts.

6 years agolavfi/buffersrc: accept unknown channel layouts.
Nicolas George [Wed, 26 Dec 2012 15:50:57 +0000 (16:50 +0100)]
lavfi/buffersrc: accept unknown channel layouts.

6 years agolavfi/sink_buffer: accept unknown channel layouts.
Nicolas George [Wed, 26 Dec 2012 15:49:16 +0000 (16:49 +0100)]
lavfi/sink_buffer: accept unknown channel layouts.

Add a field to the AVBufferSinkParams for a list of accepted
channel counts.
Change the default value for the lists in AVBufferSinkParams
to NULL, to let lavfi fill them with something useful.
The fail_enomem path is unneeded because filters are uninited
on failure.

6 years agolavfi: implement ff_query_formats_all().
Nicolas George [Wed, 26 Dec 2012 15:47:18 +0000 (16:47 +0100)]
lavfi: implement ff_query_formats_all().

6 years agolavfi: implement ff_all_channel_counts().
Nicolas George [Wed, 26 Dec 2012 15:46:43 +0000 (16:46 +0100)]
lavfi: implement ff_all_channel_counts().

6 years agolavfi: support unknown channel layouts.
Nicolas George [Wed, 2 Jan 2013 14:11:30 +0000 (15:11 +0100)]
lavfi: support unknown channel layouts.

6 years agoffmpeg: add -guess_layout_max option.
Nicolas George [Mon, 31 Dec 2012 14:20:25 +0000 (15:20 +0100)]
ffmpeg: add -guess_layout_max option.

6 years agolavc/gif: remove some obsolete/irrelevant chunks
Paul B Mahol [Fri, 25 Jan 2013 17:05:29 +0000 (17:05 +0000)]
lavc/gif: remove some obsolete/irrelevant chunks

Some code was copy pasted from muxer, which still
have same comments but unlike encoder they are still
relevant to muxer.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavf/gifdec: cosmetics: remove extra whitespace
Paul B Mahol [Fri, 25 Jan 2013 16:41:51 +0000 (16:41 +0000)]
lavf/gifdec: cosmetics: remove extra whitespace

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavf/gifdec: fix typo
Paul B Mahol [Fri, 25 Jan 2013 16:37:03 +0000 (16:37 +0000)]
lavf/gifdec: fix typo

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agosws: GBRP9, GBRP10 GBRP12 GBRP14 output support
Michael Niedermayer [Fri, 25 Jan 2013 22:05:48 +0000 (23:05 +0100)]
sws: GBRP9, GBRP10 GBRP12 GBRP14 output support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosws: GBRP output support
Michael Niedermayer [Fri, 25 Jan 2013 20:51:25 +0000 (21:51 +0100)]
sws: GBRP output support

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoatrac3: fix buffer size for get_bits.
Michael Niedermayer [Sat, 26 Jan 2013 03:27:23 +0000 (04:27 +0100)]
atrac3: fix buffer size for get_bits.

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoindeo4: check for invalid transform_size blk_size combinations
Michael Niedermayer [Sat, 26 Jan 2013 02:17:19 +0000 (03:17 +0100)]
indeo4: check for invalid transform_size blk_size combinations

The checks existing previously where not sufficient
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years ago4xm: remove avcodec_get_frame_defaults() calls
Michael Niedermayer [Sat, 26 Jan 2013 01:07:44 +0000 (02:07 +0100)]
4xm: remove avcodec_get_frame_defaults() calls

They are not needed anymore

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years ago4xm: add assert to check that the pointer from read_huffman_tables is within the...
Michael Niedermayer [Sat, 26 Jan 2013 01:05:32 +0000 (02:05 +0100)]
4xm: add assert to check that the pointer from read_huffman_tables is within the array

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years ago4xm: Check available space in read_huffman_tables()
Michael Niedermayer [Sat, 26 Jan 2013 01:03:05 +0000 (02:03 +0100)]
4xm: Check available space in read_huffman_tables()

Fixes integer overflow and out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix atrac3 decoder broken in e55d53905f34f8e8747f6d321e9a695dc02ebb2f
Michael Karcher [Fri, 25 Jan 2013 19:44:50 +0000 (20:44 +0100)]
Fix atrac3 decoder broken in e55d53905f34f8e8747f6d321e9a695dc02ebb2f

Signed-off-by: Michael Karcher <ffmpeg@mkarcher.dialup.fu-berlin.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffv1enc: fix gbrp>8bit
Michael Niedermayer [Fri, 25 Jan 2013 22:09:59 +0000 (23:09 +0100)]
ffv1enc: fix gbrp>8bit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoatrac3: use correct loop variable in add_tonal_components()
Michael Karcher [Fri, 25 Jan 2013 20:03:53 +0000 (15:03 -0500)]
atrac3: use correct loop variable in add_tonal_components()

Signed-off-by: Michael Karcher <ffmpeg@mkarcher.dialup.fu-berlin.de>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
CC:libav-stable@libav.org

6 years agolavfi/showwaves: fail in case of push_frame() error
Stefano Sabatini [Tue, 22 Jan 2013 20:11:23 +0000 (21:11 +0100)]
lavfi/showwaves: fail in case of push_frame() error

6 years agodoc/filters: apply minor fixes
Stefano Sabatini [Fri, 25 Jan 2013 16:45:27 +0000 (17:45 +0100)]
doc/filters: apply minor fixes

6 years agolavfi/showwaves: add display mode option and mode=line
Stefano Sabatini [Tue, 22 Jan 2013 11:11:36 +0000 (12:11 +0100)]
lavfi/showwaves: add display mode option and mode=line

6 years agogifdec: resync support
Michael Niedermayer [Mon, 21 Jan 2013 17:52:01 +0000 (18:52 +0100)]
gifdec: resync support

This allows decoding gifs that have junk at the begin
and also allows byte wise seeking

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc: document libx264 options and mappings
Luca Barbato [Wed, 23 Jan 2013 07:28:47 +0000 (08:28 +0100)]
doc: document libx264 options and mappings

6 years agodict: add av_dict_parse_string()
Justin Ruggles [Wed, 2 Jan 2013 21:04:23 +0000 (21:04 +0000)]
dict: add av_dict_parse_string()

Can be used to set multiple key/value pairs from a string.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agolibx264: introduce -x264-params private option
Gavriloaie Eugen-Andrei [Wed, 23 Jan 2013 07:21:55 +0000 (08:21 +0100)]
libx264: introduce -x264-params private option

It is a shortcut to set all the params using x264_param_parse,
makes simpler importing settings from other software using x264.

6 years agolavc/dnxhddata: fix bitrates for cid 1251 and 1252 in cid table
Matthieu Bouron [Mon, 21 Jan 2013 20:14:13 +0000 (21:14 +0100)]
lavc/dnxhddata: fix bitrates for cid 1251 and 1252 in cid table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>