RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
49,442 Commits 36 Branches 398 Tags 232 MiB
Commit Graph

49442 Commits

Author SHA1 Message Date
Michael Niedermayer deefdf9788 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>
 2013-01-27 21:18:00 +01:00
Michael Niedermayer 96f452ac64 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>
 2013-01-27 20:38:00 +01:00
Matthieu Bouron 9d602a0b0e lavc/dnxhdenc: print valid profiles when codec parameters are invalid 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-27 18:44:16 +01:00
Matthieu Bouron 5b83b2da08 lavc/dnxhddata: add frame_rates field to cid table 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-27 18:44:16 +01:00
Giorgio Vazzana 93d319a582 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>
 2013-01-27 18:19:27 +01:00
Stefano Sabatini 5306976be8 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.
 2013-01-27 17:58:16 +01:00
Stefano Sabatini 27db2bf000 ffmpeg: remove -crop* and -pad* options 
The options have been deprecated and are non-operational since more than
two years.
 2013-01-27 16:56:47 +01:00
Stefano Sabatini 43af18ef8b ffmpeg: implement -force_key_frames expression evalution 2013-01-27 16:56:47 +01:00
Michael Niedermayer 2b14344ab3 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>
 2013-01-27 16:47:56 +01:00
Michael Niedermayer f5c0b9aa6f 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>
 2013-01-27 16:30:01 +01:00
Michael Niedermayer edde562130 AVG_PIXELS8_XY2: fix typo, make code actually work 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-27 15:50:26 +01:00
Daniel Kang 5327a45552 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>
 2013-01-27 15:20:44 +01:00
Daniel Kang d9e62f368d 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>
 2013-01-27 15:20:35 +01:00
Michael Niedermayer 5934be16cc x86/mpeg4qpel: Fix author attribution 
Also fix project name

See git blame/log/show and
commit 826f429ae9
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>
 2013-01-27 15:07:02 +01:00
Michael Niedermayer aa3f449955 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 e9c0a38ff0
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 607dce96c0
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>
 2013-01-27 14:47:58 +01:00
Michael Niedermayer 91c8921d80 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>
 2013-01-27 14:24:28 +01:00
Michael Niedermayer 6b2f7fd1c7 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>
 2013-01-27 13:32:56 +01:00
Clément Bœsch f2b6aabd3d lavf/srtdec: do not try to queue empty subtitle chunks. 
Regression since 3af3a30.
Fixes Ticket2167.
 2013-01-27 20:26:35 +09:00
Martin Storsjö 2026eb1408 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>
 2013-01-27 13:17:25 +02:00
Paul B Mahol 07a7145d89 lavc/iff: rgbn: fix decoding on big endian 
Fixes #2193.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-27 10:59:58 +00:00
Daniel Kang 96753bd00d 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>
 2013-01-27 08:41:48 +01:00
Daniel Kang 0eedf5d74d 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>
 2013-01-27 08:41:46 +01:00
Rémi Denis-Courmont 78bc4d69eb hwaccel: do not offer unsupported pixel formats 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-01-27 07:03:22 +01:00
Rémi Denis-Courmont ec0e92002b vdpau: add missing pixel format for H.264 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-01-27 07:03:22 +01:00
Daniel Kang 71155d7b41 dsputil: x86: Convert mpeg4 qpel and dsputil avg to yasm 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-01-27 06:45:31 +01:00
Michael Niedermayer f9abeecd94 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>
 2013-01-27 05:58:47 +01:00
Michael Niedermayer 167af704ea 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>
 2013-01-27 05:54:52 +01:00
Ronald S. Bultje f90ff772e7 Move H264/QPEL specific asm from dsputil.asm to h264_qpel_*.asm. 2013-01-26 20:35:42 -08:00
Michael Niedermayer b16830840e tiff: in add_string_metadata() check the count more completely 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-27 04:53:03 +01:00
Michael Niedermayer 5de286ef88 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>
 2013-01-27 02:15:02 +01:00
Michael Niedermayer 362271d72f 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>
 2013-01-27 02:11:19 +01:00
Michael Niedermayer 6512405ce2 sws: disable yuv2rgb warning for planar rgb. 
planar rgb formats do not use the table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-26 23:09:58 +01:00
Michael Niedermayer f0d3a03115 sws: include isRGB in isAnyRGB() so that future RGB formats wont be missed again 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-26 21:38:01 +01:00
Michael Niedermayer 02001a372d 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>
 2013-01-26 20:40:44 +01:00
Michael Niedermayer 3c2ecfcc24 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>
 2013-01-26 20:40:44 +01:00
Michael Niedermayer 4e585f6325 sws: use planarRgbToRgbWrapper only for 8bit per component 
The function doesnt support >8bit currently

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-26 20:40:44 +01:00
Michael Niedermayer 5cb0782b95 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>
 2013-01-26 15:53:58 +01:00
Michael Niedermayer c46943ec19 Merge commit '3f47d316cda9037024ffbc76f789332e62b729bc' 
* commit '3f47d316cda9037024ffbc76f789332e62b729bc':
  mpegvideo_enc: do not modify the input frame.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-26 15:46:39 +01:00
Michael Niedermayer 8380fc8884 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>
 2013-01-26 15:42:29 +01:00
Michael Niedermayer 8ab97a60ef 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>
 2013-01-26 15:19:48 +01:00
Stefano Sabatini c0c06c1bba doc/texi2pod: fix warnings introduced in e7e14bc69a 
The variable "$section" was replaced by "$chapter".
 2013-01-26 15:12:57 +01:00
Paul B Mahol 27cadb9ce3 remove av_strnstr from Changelog 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-26 14:04:30 +00:00
Luca Barbato fe1057e017 doc: update the reference for the title 
The recent texi2html exports the title as 'fulltitle_no_texi'.
 2013-01-26 14:49:57 +01:00
Michael Niedermayer 325ee4ed7a 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>
 2013-01-26 14:47:08 +01:00
Michael Niedermayer 3a9f48f033 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>
 2013-01-26 14:39:02 +01:00
Michael Niedermayer 446d62f0cf 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>
 2013-01-26 14:33:06 +01:00
Michael Niedermayer d235d240d8 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>
 2013-01-26 14:18:48 +01:00
Michael Niedermayer e7e14bc69a 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>
 2013-01-26 13:34:30 +01:00
Anton Khirnov 04f4dbc2fa mpegvideo_enc: fix indentation in load_input_picture() 2013-01-26 13:08:38 +01:00
Anton Khirnov 3f47d316cd mpegvideo_enc: do not modify the input frame. 2013-01-26 13:08:32 +01:00