virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
70,779 Commits 37 Branches 400 Tags 467 MiB
09f057170e
Commit Graph

70779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clément Bœsch
09f057170e avfilter/vf_colormatrix: make sure the number of threads is even for yuv420p 
Fix crash with for example:
  ffmpeg -f lavfi -i testsrc=568x320 -threads 3 -vf format=yuv420p,colormatrix=bt709:smpte170m -f null -
 2015-03-17 20:19:54 +01:00
Michael Niedermayer
2cfa1fdb08 Merge commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c' 
* commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c':
  isom: Add support for TSCC2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-17 20:05:53 +01:00
Michael Niedermayer
33a79e443b Merge commit '91894f27dce531c13d7e1be20253877f2e1e9e66' 
* commit '91894f27dce531c13d7e1be20253877f2e1e9e66':
  configure: Disable shift operator precedence warnings with MSVC

Conflicts:
	configure

See: 9e208ce6dd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-17 19:58:02 +01:00
Michael Niedermayer
13f8bbfb70 avformat/mov: fix mis-detection of jpeg2000 
Fixes demuxer choice for Ticket 2792

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-17 19:05:44 +01:00
Michael Niedermayer
6cd079a4e7 avfilter/vf_histeq: Change enums to int, which are accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-17 17:13:38 +01:00
Michael Niedermayer
7363889771 avfilter/vf_fieldmatch: Change enums to int, which are accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-17 17:11:42 +01:00
Michael Niedermayer
e6140e7822 avfilter/vf_field: Change enum to int, which is accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-17 16:52:10 +01:00
Andreas Cadhalpun
39ddda12f1 mxfenc: fix memleaks in mxf_write_footer 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Reviewed-by: tomas.hardin@codemill.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-17 15:05:41 +01:00
Tobias Rapp
5be04f9789 doc/protocols: Fixed missing example section marker 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-17 15:04:22 +01:00
Luca Barbato
96dd04427f isom: Add support for TSCC2 
As produced by Camtasia 4.
 2015-03-17 12:21:23 +01:00
Diego Biurrun
91894f27dc configure: Disable shift operator precedence warnings with MSVC 2015-03-17 11:59:31 +01:00
Michael Niedermayer
d24af7044d avcodec/vc1_pred: Fix undefined shifts 
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-17 01:51:59 +01:00
Clément Bœsch
b17620b81b avcodec/libx264: use AVERROR_EXTERNAL instead of AVERROR_UNKNOWN 2015-03-17 00:05:58 +01:00
Clément Bœsch
fd682b1892 avfilter: handle error in query_formats() of a bunch of random video filters 2015-03-16 23:43:12 +01:00
Clément Bœsch
545b0dd6aa avfilter/formats: proper error handling in ff_set_common_*() functions 2015-03-16 23:43:12 +01:00
Clément Bœsch
f861d9b2c6 avfilter/formats: proper error handling in ff_channel_layouts_ref() and ff_formats_ref() 
Also make sure the allocation and its check are properly done.
 2015-03-16 23:43:12 +01:00
Clément Bœsch
93d9ce7cec avfilter/formats: use av_realloc_array in ADD_FORMAT() 2015-03-16 23:43:12 +01:00
Clément Bœsch
38fb183b12 avfilter/formats: remove unused COPY_INT_LIST() macro 
This macro is unused since 247fa6c27c.
 2015-03-16 23:43:12 +01:00
Michael Niedermayer
ae65cc7ed3 Merge commit '2cb9c2fc59c9267ad2631c07c81c188058502259' 
* commit '2cb9c2fc59c9267ad2631c07c81c188058502259':
  movenc: Allow interleaving samples when writing fragmented files

Conflicts:
	libavformat/movenc.c
	libavformat/movenc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 23:30:13 +01:00
srikanth
730f3c49e0 OpenCL uninit bug fix - clear is_compiled flag 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 22:52:19 +01:00
Michael Niedermayer
b425b81fd2 avformat/rtsp: Fix potential pointer overflow in sdp_probe() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 22:40:36 +01:00
Michael Niedermayer
1b3b018aa4 avformat/mpegts: Fix potential pointer overflows 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 22:37:46 +01:00
Michael Niedermayer
29db8e45fc configure: Silence EMMS warnings in ICC 
Real world MMX code does not put EMMS at the start and end of every function,
it would be incredibly inefficient to do that
thus do not warn about that

Tested-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 22:20:46 +01:00
Michael Niedermayer
312eb0d66f Merge commit '50ff0c05b691524d1fd044a2f2eefb706932fc98' 
* commit '50ff0c05b691524d1fd044a2f2eefb706932fc98':
  movenc: Support writing multiple trun atoms

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 21:53:02 +01:00
Michael Niedermayer
1904704a48 Merge commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce' 
* commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce':
  configure: move cross_compile checks after the toolchain section

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 21:46:02 +01:00
Michael Niedermayer
b37852c7d9 Merge commit '3e1b5cbc9ab0a61c9bec08a1df1404b9da6ed7ea' 
* commit '3e1b5cbc9ab0a61c9bec08a1df1404b9da6ed7ea':
  configure: handle Apple's armv7s in probe_arm_arch()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 21:34:14 +01:00
Michael Niedermayer
6416dce490 Merge commit 'f01c77157789b8e3a59ed2c9646faf8299e41641' 
* commit 'f01c77157789b8e3a59ed2c9646faf8299e41641':
  fate: add explicit support for the toolchain configure option

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 21:27:23 +01:00
Michael Niedermayer
7c9ad3c4ea Merge commit 'a9d60c390f35f3954821bd635fd31bbb5036b29d' 
* commit 'a9d60c390f35f3954821bd635fd31bbb5036b29d':
  doc: fate: remove outdated SSH key fingerprint

Conflicts:
	doc/fate.texi

Not merged, this does not apply to our servers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 21:19:29 +01:00
Rainer Hochecker
786032cad8 hevc: avoid unnecessary calls to get_format 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 20:48:14 +01:00
zhaoxiu.zeng
332776f6c5 avformat/cavsvideodec: use avpriv_find_start_code in cavsvideo_probe() 
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 15:40:10 +01:00
Michael Niedermayer
d79f7bf0d6 avcodec/x86/cavsdsp: remove incorrect LOCAL_ALIGN tmp 
This is faster and simpler as well

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 14:51:51 +01:00
Michael Niedermayer
12cf61c3b2 avcodec/hevc: Fix undefined shifts 
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 14:27:11 +01:00
Michael Niedermayer
04c52389d8 avcodec/tdsc: Remove ;; 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 13:04:47 +01:00
Micah Galizia
fca0851879 avformat/hls: refactor repeated HLS option updates 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 13:01:39 +01:00
Martin Storsjö
2cb9c2fc59 movenc: Allow interleaving samples when writing fragmented files 
This is incompatible with the omit_tfhd_offset flag (writing
position independent fragments with interleaving requires the
default_base_moof flag).

This makes the moof atoms slightly bigger, but can be better for
playback (improving locality of sample data in the mdat).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-03-16 13:23:19 +02:00
Martin Storsjö
50ff0c05b6 movenc: Support writing multiple trun atoms 
This is needed if all the data for one track isn't continuous
within the mdat. Normally we make sure all the data for one
track is continuous, but in new cases we will need to have
the samples interleaved.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-03-16 13:23:19 +02:00
Janne Grunau
faab8f9fcb configure: move cross_compile checks after the toolchain section 2015-03-16 11:55:47 +01:00
Janne Grunau
3e1b5cbc9a configure: handle Apple's armv7s in probe_arm_arch() 2015-03-16 11:55:47 +01:00
Janne Grunau
f01c771577 fate: add explicit support for the toolchain configure option 2015-03-16 11:55:47 +01:00
Janne Grunau
a9d60c390f doc: fate: remove outdated SSH key fingerprint 2015-03-16 11:55:47 +01:00
Michael Niedermayer
18a9647996 Merge commit '66a0ac0a802dd794acc1ab8559d3db9e98755b57' 
* commit '66a0ac0a802dd794acc1ab8559d3db9e98755b57':
  mkv: Add support for DVB subtitles

See: 4789c25d83
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 11:44:26 +01:00
Stefano Sabatini
83ee820a16 lavfi/sendcmd: improve error reporting and robustness in case of missing commands 
In particular, fix crash with -vf sendcmd, when no arguments are provided.
 2015-03-16 10:49:25 +01:00
James Almer
e8374d7202 x86/proresdsp: remove ff_prores_idct_put_10_sse4 
It's exactly the same as the sse2 version.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-03-16 01:52:44 -03:00
James Almer
bdd179c8cb x86/proresdsp: remove unused macro 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-03-16 01:49:34 -03:00
Michael Niedermayer
1e4d0498df avformat/mov: Disallow ".." in dref unless use_absolute_path is set 
as this kind of allows to circumvent it to some extend.
We also could add a separate parameter or value to choose this

Found-by: ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 03:47:56 +01:00
Mark Reid
e575589378 libavformat/mxfdec: fix MXFPackage->comment_refs memory leak 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 03:37:44 +01:00
Micah Galizia
7859618aff avformat/hls: store cookies returned in HLS key response 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 01:57:01 +01:00
Michael Niedermayer
e802abd6e3 avcodec/dcadec: if XLL is enabled use xll channels 
Fixes outputting 14 channels instead of 7

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 01:19:18 +01:00
Michael Niedermayer
21d25441c6 avcodec/dcadec: Only upsample as much data as is there 
Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 00:44:54 +01:00
Michael Niedermayer
3e48616226 Merge commit '9a60b1fad02cb783b895b2145c3dafc01f7b337c' 
* commit '9a60b1fad02cb783b895b2145c3dafc01f7b337c':
  libswscale: fix compiler warnings enumerated type mixed with another type

Conflicts:
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-16 00:15:16 +01:00