virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
61,042 Commits 37 Branches 400 Tags 460 MiB
52a2138656
Commit Graph

61042 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luca Barbato
175e506332 hevc: Mention the missing SPS in the error message 2014-02-19 16:59:40 +01:00
Luca Barbato
93632a70f9 doc: Name the MOV muxer as it should be called 
The section name is the muxer, not the format.
 2014-02-19 16:59:40 +01:00
Luca Barbato
a7b3216cbd doc: Sort the muxer documentation 
Keep the sections alphabetically sorted.
 2014-02-19 16:59:40 +01:00
Michael Niedermayer
b14517d3cd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vf_interlace: deprecate lowpass option

Conflicts:
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-19 16:16:41 +01:00
Michael Niedermayer
130c33af35 Merge commit 'b23bc95920e2f10b9621857e829c45b064f356c0' 
* commit 'b23bc95920e2f10b9621857e829c45b064f356c0':
  x86: dca: Add missing multiple inclusion guards

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-19 15:44:48 +01:00
Diego Biurrun
874c751cc5 threads: Check w32threads dependencies at the configure stage 
Also add warning comment about threading implementations without matching
atomics implementation to the atomics fallback implementation.
 2014-02-19 15:12:37 +01:00
Michael Niedermayer
d808dce4a9 Merge commit '294a51e18ab7df4d658249361a03f0d716a4e9f0' 
* commit '294a51e18ab7df4d658249361a03f0d716a4e9f0':
  gitignore: Add all examples below doc/examples

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-19 14:33:22 +01:00
Michael Niedermayer
3f461566b7 avformat/movenc: simplify code, decrease difference to libav 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-19 14:20:22 +01:00
Michael Niedermayer
ef1aae6ea9 Merge commit '1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66' 
* commit '1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66':
  movenc: Add a fallback fragmentation method for plain mp4 as well

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-19 14:19:45 +01:00
Michael Niedermayer
53d11f7b2d Merge commit '543156d7518f5e5d731123da066d86278f9fa492' 
* commit '543156d7518f5e5d731123da066d86278f9fa492':
  arm: Mark the stack as non-executable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-19 14:07:26 +01:00
Michael Niedermayer
36fb07d1ab avcodec/mpeg4videodec: set field durations to safe values when they are invalid 
Fixes division by 0
Fixes: 3c980274cecaca6ca5d6e517c0c1983e-signal_sigabrt_7ffff7125425_410_cov_3621042467_2_audio_streams.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-19 13:45:39 +01:00
Vittorio Giovara
35b05c5184 vf_interlace: deprecate lowpass option 2014-02-19 12:26:34 +01:00
Nicolas George
6c27aea811 lavfi/pan: use extended_data instead of data. 
Fix trac ticket #3380.
 2014-02-19 11:29:15 +01:00
Diego Biurrun
b23bc95920 x86: dca: Add missing multiple inclusion guards 2014-02-19 10:19:15 +01:00
Diego Biurrun
294a51e18a gitignore: Add all examples below doc/examples 2014-02-19 10:19:15 +01:00
Martin Storsjö
1e142d5b48 movenc: Add a fallback fragmentation method for plain mp4 as well 
Previously the default fragmentation method was only enabled
if writing an ISM file.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-02-19 09:58:14 +02:00
Martin Storsjö
543156d751 arm: Mark the stack as non-executable 
If linking in an object file without this attribute set, the
linker will assume that an executable stack might be needed.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-02-19 09:57:19 +02:00
Ronald S. Bultje
b9936e59e8 tiny_ssim: add per-frame metrics and final ssim db number. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-19 02:39:05 +01:00
Michael Niedermayer
d0e236292d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h264: informative error reporting in decode_slice_header()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-19 02:25:02 +01:00
Michael Niedermayer
2d93f76f8a Merge commit '96f9fbe10933944b3eba86efa1d1ca094f2c28f8' 
* commit '96f9fbe10933944b3eba86efa1d1ca094f2c28f8':
  h264: fix slice_type value reported in decode_slice_header()

See: ec51b3308e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-19 02:24:13 +01:00
Luca Barbato
fea6db064b h264: informative error reporting in decode_slice_header() 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-02-18 23:47:55 +01:00
Luca Barbato
96f9fbe109 h264: fix slice_type value reported in decode_slice_header() 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-02-18 23:47:32 +01:00
Michael Niedermayer
8f853159f6 avutil/opt: preserve fractions in set_string_number() 
This avoids going over a double precission float, which may loose precission

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-18 21:49:56 +01:00
Michael Niedermayer
3e70c7023e ffmpeg: support setting the chroma intra matrix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-18 18:19:28 +01:00
Michael Niedermayer
cbcfd7da4d avcodec: support setting the chroma intra matrix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-18 18:19:27 +01:00
Gonzalo Garramuno
3d20260157 avcodec/exr: read layers 
EXR files have, like tiffs, multiple channels and layers.  I have a
patch for exr.c that allows you to select the layer you want to process
thru a -layer flag.  It is not bulletproof but works for all layers that
have 3 channels in them (normals, motion vectors, etc).
The calling convention for ffmpeg is:

ffmpeg -layer Diffuse -i myexr.%d.exr test.mov

Here's an exr image with multiple layers:

http://www.datafilehost.com/d/e45d9a1c

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-18 18:11:23 +01:00
Hendrik Leppkes
7716eda0aa vp9/x86: set correct number of registers used in intra pred asm 
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-18 17:20:14 +01:00
Michael Niedermayer
9bb1af8f36 avcodec/huffyuvdec: use RGB0 for 24bit rgb output instead of BGRA 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-18 16:07:54 +01:00
Michael Niedermayer
1355cafcb6 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Fix libswresample compilation with Apple Neon assembler.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-18 15:40:53 +01:00
Michael Niedermayer
469de4f583 avcodec/huffyuvdec: use the correct height field 
Fixes Ticket3395

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-18 13:51:25 +01:00
Michael Niedermayer
61d59703c9 avcodec/snow: split block clipping checks 
Fixes out of array read
Fixes: d4476f68ca1c1c57afbc45806f581963-asan_heap-oob_2266b27_8607_cov_4044577381_snow_chroma_bug.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-18 02:54:18 +01:00
Michael Niedermayer
c57fc97e95 avformat/bink: Check return value of av_add_index_entry() 
Fixes null pointer dereference
Fixes: cdbf15cbd0a27cee958dd0b8800e452e-signal_sigsegv_737991_2083_cov_317652874_LBSTART.BIK
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 23:47:05 +01:00
Michael Niedermayer
6742614c23 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doxygen: Replace @parblock syntax with manual linebreaks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 21:26:59 +01:00
Michael Niedermayer
f3bb5f28d3 Merge commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53' 
* commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53':
  doxygen: Add a number of missing function parameter descriptions

Conflicts:
	libavformat/avformat.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 21:11:29 +01:00
Michael Niedermayer
27f55beba2 Merge commit '614b9e4db8f3d7c23fc0410fc04745a727a82f4e' 
* commit '614b9e4db8f3d7c23fc0410fc04745a727a82f4e':
  h264: use avpriv_request_sample for chroma_format_idc

Conflicts:
	libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 20:59:51 +01:00
Michael Niedermayer
d42ec8433c avcodec/ansi: fix integer overflow 
Fixes out of array read
Fixes: 5f9698e86d92f19bb08d54ff0d57027f-signal_sigsegv_b30756_3795_cov_2693691257_ansi256.ans
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 20:50:33 +01:00
Peter Ross
911eb71133 avcodec/vp8dsp: evaluate CONFIG_VP7_DECODER/CONFIG_VP8_DECODER 
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 18:22:06 +01:00
Reimar Döffinger
e535897fad Fix libswresample compilation with Apple Neon assembler. 
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2014-02-17 17:40:10 +01:00
Diego Biurrun
2f2b2efd31 doxygen: Replace @parblock syntax with manual linebreaks 
@parblock is only supported in very recent Doxygen versions.
 2014-02-17 15:36:17 +01:00
Diego Biurrun
4d7ab5cfeb doxygen: Add a number of missing function parameter descriptions 2014-02-17 15:36:09 +01:00
James Almer
07b4b0ca62 tta/x86: add ff_ttafilter_process_dec_{ssse3, sse4} 
Results are from a Win64 build running on an AMD FX 6300

1121 decicycles in ttafilter_process_dec_c, 16777112 runs, 104 skips
522 decicycles in ff_ttafilter_process_dec_ssse3, 16777149 runs, 67 skips
477 decicycles in ff_ttafilter_process_dec_sse4, 16777156 runs, 60 skips

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 13:51:19 +01:00
Michael Niedermayer
341639fe80 doc/examples: remove pathes from doxy examples 
This makes the examples page less cluttered

Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 13:50:53 +01:00
Ronald S. Bultje
21a0451167 vp9: split decode_coeff_b loop inside txsz branch. 
The advantage of this is that the is32x32 division branch in
decode_coeffs_b is removed from the inner loop to outside the block
coef decoding loop in decode_coeffs. Also, it allows us to merge the
txsz branches from the block coef decoding loop, the context merge
and the context split.
 2014-02-17 13:39:00 +01:00
Ronald S. Bultje
fdb093c4e4 vp9/x86: intra prediction SIMD. 
Partially based on h264_intrapred. (I hope to eventually merge these
two intrapred implementations back together.)
 2014-02-17 13:39:00 +01:00
Michael Niedermayer
38a08e0aea Merge remote-tracking branch 'lukaszmluki/master' 
* lukaszmluki/master:
  lavd: add list devices API
  lavd/opengl_enc_shaders: fix gray* shader

Conflicts:
	doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 03:18:44 +01:00
Nicholas Robbins
b02b783417 MAINTAINERS: add myself as vf_dejudder.c maintainer 
Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 03:13:55 +01:00
Peter Ross
a707d18a48 avcodec/vp8dsp: zeroise input coefficient array after use in vp7 idct functions 
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 03:12:34 +01:00
Michael Niedermayer
c97c7c2adf Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc: Fix project name typo

Merge for metadata only

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 02:47:20 +01:00
Michael Niedermayer
1fc74926a5 Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 
* commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90':
  Move all example programs to doc/examples

Conflicts:
	configure
	doc/Makefile
	doc/doxy-wrapper.sh
	doc/examples/avcodec.c
	doc/examples/decoding_encoding.c
	doc/examples/metadata.c
	doc/examples/muxing.c
	doc/examples/transcode_aac.c
	libavcodec/Makefile
	libavcodec/api-example.c
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 02:22:01 +01:00
Michael Niedermayer
91253839e1 avcodec/h264: more completely check the loop filter parameters 
Fixes out of array read
Fixes: caa65cc01655505705129b677189f036-signal_sigsegv_fdcc43_2681_cov_3043376737_PPH422I5_Panasonic_A.264
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-17 01:29:34 +01:00