RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-27 01:42:20 +00:00
Code Issues Projects Releases Wiki Activity
65,462 Commits 37 Branches 400 Tags 245 MiB
36bce999f5
Commit Graph

65462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
ad99837b63 Merge commit '03c9f357a4c2307a7913cea2cbf0ba817e80beb6' 
* commit '03c9f357a4c2307a7913cea2cbf0ba817e80beb6':
  ppc: idctdsp: Immediately return if no AltiVec is available

Conflicts:
	libavcodec/ppc/idctdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-01 15:11:05 +02:00
Luca Barbato
fa14804c83 flv: Index the audio stream 
And leverage the video index if the video is just disabled as wm4
did in an initial patch.
 2014-08-01 15:04:51 +02:00
Michael Niedermayer
713dbe0655 Merge commit '706208ef47bffd525c982975d2756f7b2b220b8d' 
* commit '706208ef47bffd525c982975d2756f7b2b220b8d':
  fate: Split fate-pixdesc tests and dispatch them through Make

Conflicts:
	tests/fate-run.sh
	tests/ref/fate/filter-pixdesc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-01 15:03:22 +02:00
Michael Niedermayer
9e052df86d avfilter/vf_pullup: 2nd try to workaround gcc 4.4.3 bug on arm 
The first try failed to work with some build flags

The gcc version affected is very old and unmaintained AFAIK thus i made no
attempt to report this to the gcc developers.

The workaround is pushed as it may still affect users and does affect one
fate client

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-01 14:17:53 +02:00
Vittorio Giovara
7ab551f9fd h264: prevent theoretical infinite loop in SEI parsing 
Properly address CVE-2011-3946 and parse bitstream as described in the spec.

CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
 2014-08-01 13:08:32 +01:00
Luca Barbato
b2e059a1ff pixdesc: K&R formatting cosmetics 
Also change some comments to multiline.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-08-01 13:07:53 +01:00
Vittorio Giovara
92a36a6b33 pngdec: correctly indent macros 2014-08-01 13:07:53 +01:00
Vittorio Giovara
52269f48e8 Revert "vf_interlace: deprecate lowpass option" 
This reverts commit 35b05c5184.
A warning is introduced in case this option is used.
 2014-08-01 13:02:29 +01:00
Diego Biurrun
4da8cdbb91 tscc: Eliminate pointless variable indirections in decode_frame() 2014-08-01 04:08:46 -07:00
Diego Biurrun
5735552f1f pngenc: Drop pointless pointer cast in png_write_row() 2014-08-01 04:08:45 -07:00
Carl Eugen Hoyos
a80191379b Fix standalone compilation of the WebVTT decoder. 2014-08-01 12:50:38 +02:00
Carl Eugen Hoyos
970c7d9b69 Add forgotten APIchanges entry for probesize2. 
Update some git hashes.
 2014-08-01 12:49:56 +02:00
Benoit Fouet
42f25fe009 h264_mp4toannexb_bsf: always set idr_sps_pps_seen when SPS/PPS is seen. 
In order not to break a sequence like "SPS IDR SPS IDR", the boolean
telling that the SPS/PPS has been seen should always be set.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-01 12:20:14 +02:00
Benoit Fouet
66af2a01d2 h264: remove useless assignment. 
source index, as well as dest one, is unconditionnaly set afterwards,
before being effectively used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-01 12:20:01 +02:00
Diego Biurrun
a786c8259d idct: Split off Xvid IDCT 
The Xvid IDCT is only required to decode some Xvid-encoded MPEG-4 files,
so there is no point in having it as an unconditional part of idctdsp.
 2014-08-01 01:25:18 -07:00
Diego Biurrun
03c9f357a4 ppc: idctdsp: Immediately return if no AltiVec is available 
This is how all the other init functions operate.
 2014-08-01 01:23:11 -07:00
Diego Biurrun
706208ef47 fate: Split fate-pixdesc tests and dispatch them through Make 
This allows running all the tests individually and/or in parallel.
 2014-08-01 01:18:30 -07:00
Michael Niedermayer
7db3a46a3d Merge commit 'd98e6c5d5d80c1dfe0c30f2e73d41a3aea0b920d' 
* commit 'd98e6c5d5d80c1dfe0c30f2e73d41a3aea0b920d':
  pgssubdec: Check RLE size before copying

See: c0d68be555
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-01 04:46:50 +02:00
Michael Niedermayer
d98e6c5d5d pgssubdec: Check RLE size before copying 
Make sure the buffer size does not exceed the expected
RLE size.

Prevent an out of array bound write.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Bug-Id: CVE-2013-0852

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-08-01 02:13:32 +02:00
Lou Logan
d76675d9c0 doc/indevs: mention required configure options 
For x11grab, libcdio, and libdc1394 input devices.

Signed-off-by: Lou Logan <lou@lrcd.com>
 2014-07-31 15:00:41 -08:00
James Almer
62baf5b853 x86/hevc_deblock: use existing x86util transpose macro in chroma_{10, 12} 
Cosmetic change. No measurable difference in speed.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 22:56:21 +02:00
Michael Niedermayer
39133efc1b avdevice/oss_audio: Check SNDCTL_DSP_GETFMTS failure, print a warning but continue 
Found-by: CSA and Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 21:19:15 +02:00
Michael Niedermayer
fc19edd8f5 avfilter/trim: remove duplicate assignment 
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 20:53:15 +02:00
Michael Niedermayer
a75a60f686 avutil/pixdesc: remove unneeded assignment 
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 20:44:46 +02:00
Michael Niedermayer
5bedbc3da2 avcodec/diracdec: remove unneeded assignment 
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 20:40:10 +02:00
Michael Niedermayer
590c2996ee avcodec/flac_parser: remove duplicate assignent 
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 20:35:54 +02:00
Michael Niedermayer
1af563b5df avcodec/ratecontrol: remove unneeded statement 
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 20:35:54 +02:00
Reimar Döffinger
f0de01856f dict.c: minor simplification. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-07-31 20:10:29 +02:00
Anshul Maheswhwari
fcb11ec291 v4l2enc: adding AVClass 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 18:59:20 +02:00
Michael Niedermayer
0782fb6bcb libavcodec/h264_parser: Increase parse_history, fix huge resolutions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 16:39:04 +02:00
Benoit Fouet
bf428bb314 h264_mp4toannexb_bsf: account for consecutive IDR pictures. 
If there are consecutive IDR pictures, then SPS/PPS should be prepended
to all of them, not only the first one.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 15:59:47 +02:00
Michael Niedermayer
dd200c56c0 avcodec/dvdsubdec: free subtitle rectangles if nothing is output 
Fixes assertion failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 14:17:46 +02:00
Michael Niedermayer
ceff29b9ad avcodec/resample: check for malloc failure 
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 13:04:28 +02:00
Michael Niedermayer
72555f4a38 avcodec/pthread_slice: Check for malloc failure 
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 12:56:21 +02:00
Michael Niedermayer
37ec7d291e avcodec/mpeg4video_parser: Check for extradata parsing failure 
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 12:56:21 +02:00
Gerion Entrup
dc315cdb4e doc: add very basic libcdio documentation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 02:54:17 +02:00
Nicolas Martyanoff
467e9d6186 avformat/hlsenc: add some empty lines to make the code easier to read 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 00:33:49 +02:00
Nicolas Martyanoff
706fcffce1 avformat/hlsenc: rename some identifers to make the code easier to read 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 00:31:49 +02:00
Nicolas Martyanoff
53f10e0368 avformat/hlsenc: Add some comments to make the code easier to read 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 00:04:05 +02:00
Michael Niedermayer
a99de9ca2c Merge commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011' 
* commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011':
  configure: Globally add ZLIB_CONST to CPPFLAGS if zlib is enabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-30 23:34:25 +02:00
Diego Biurrun
a0ce85ac7d configure: Globally add ZLIB_CONST to CPPFLAGS if zlib is enabled 2014-07-30 11:55:40 -07:00
Reimar Döffinger
1c84aad718 movdec: remove nonsensical snprintf. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-07-30 20:25:29 +02:00
Reimar Döffinger
04aec74f45 mxfdec: add missing "const" to array declaration. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-07-30 20:25:29 +02:00
Michael Niedermayer
547d64a49a ffprobe: print some basic information about avframe side data 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-30 19:23:08 +02:00
Michael Niedermayer
ba3e3311ef avutil/frame: add av_frame_side_data_name() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-30 19:19:22 +02:00
Michael Niedermayer
6f622e5fcb avfilter/f_select: avoid double->int in debug output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-30 17:50:35 +02:00
Michael Niedermayer
bcbfb95b0e avfilter/f_select: Set var_values[VAR_KEY] correctly 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-30 17:49:26 +02:00
Michael Niedermayer
887d8d293f avfilter/f_select: avoid using doubles for equals checks and casts to enums 
This might silence some warnings.

Issue found from: a8d803a320
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-30 17:37:09 +02:00
Michael Niedermayer
7994c1cd76 Merge commit 'a8d803a320fb08b3ad5db4fffc79abd401206905' 
* commit 'a8d803a320fb08b3ad5db4fffc79abd401206905':
  vf_select: Drop a debug av_log with an unchecked double to enum conversion

Conflicts:
	libavfilter/f_select.c

Not merged, see next commit for the bugfix

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-30 17:32:15 +02:00
Nicolas George
91244073fd ffmpeg_filter: refuse to configure input without a decoder. 
The decoder is necessary in order to filter frames.
This makes the error message clearer in this case:
currently, it will usually fail because the pixel or sample
format is not defined and is converted into "(null)"
(non-portable).

Enhance trac ticket #3779.
 2014-07-30 14:40:45 +02:00