virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity
65,780 Commits 39 Branches 425 Tags
ba29746feb541f5cde4154795041ff2faa15bedf
Commit Graph
65780 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Clément BœschandClément Bœsch ba29746feb avfilter/showwaves: split out draw sample code 2014-08-20 22:18:35 +02:00
Clément BœschandClément Bœsch f2f6d45dbd avfilter/showwaves: add "cline" mode (centered line) 2014-08-20 22:16:50 +02:00
James Almer 76a99d467f x86/hecv_res_add: add ff_hevc_transform_add{8,16,32}_8_avx 
~15% faster than sse2

Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-08-20 16:54:52 -03:00
Lou Logan d2163f5e28 doc/ffmpeg: fix metadata language example 
Signed-off-by: Lou Logan <lou@lrcd.com>
 2014-08-20 10:44:22 -08:00
Michael Niedermayer a5cbff22b2 avfilter/avf_showspectrum: fix colums typo 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-20 18:49:01 +02:00
Michael Niedermayer 2076095549 avformat/asfdec: Check av_new_packet()s return code 
Fixes CID1041093

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-20 18:32:59 +02:00
Michael Niedermayer 05dd5368a9 avformat/nutdec: always initialize event_flags 
Fixes: CID1231990

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-20 16:45:08 +02:00
Michael Niedermayer 7caacc50ae avcodec/hevc_ps: do cleanup in case of unsupported bit depth 
Fixes memleak
Fixes CID1231989

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-20 15:14:53 +02:00
Stefano Sabatini cb0524f7a0 lavfi/apad: fix if_( style 2014-08-20 12:35:16 +02:00
James Almer 9f498f4e6f x86/hevc_res_add: fix register count in hevc_transform_add{16,32}_10_avx2 
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-08-19 21:34:52 -03:00
Pierre Edouard LepereandMichael Niedermayer a6af4bf64d x86: hevc: adding transform_add 
Reviewed-by: James Almer <jamrial@gmail.com>
Approved-by: Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-20 01:28:56 +02:00
Michael Niedermayer 5a22877e9d Merge commit '67a7695c142561fe60f21adffe89c133385d37c9' 
* commit '67a7695c142561fe60f21adffe89c133385d37c9':
  avfilter: Remove unused variable from ff_get_video_buffer()

Conflicts:
	libavfilter/video.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-20 00:23:15 +02:00
James Almer 201a511bb9 lavc/tiff: add support for YUV deflate 
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-08-19 18:48:39 -03:00
James Almer b4231b4fed lavc/tiff: move unpack_yuv() above the deflate functions 
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-08-19 18:48:31 -03:00
Jon MorleyandMichael Niedermayer 18e70006e7 avcodec/adpcm: Fix incorrect AVSampleFormat for sample_fmts_s16p 
The AVSampleFormat list of sample_fmts_s16p is missing the trailing "P" for planar formats. AV_SAMPLE_FMT_S16 vs AV_SAMPLE_FMT_S16P

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-19 23:09:16 +02:00
Michael Niedermayer f0c0ae37c6 avcodec/tiff: Check that pix_fmt is a yuv variant for TIFF_PHOTOMETRIC_YCBCR 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-19 21:09:07 +02:00
Michael Niedermayer 6ea69a8ffa avcodec/tiff: do not use photometric to detect pix_fmt 
They should match but they do not always
Fixes assertion failure
no testcase with unmodified source available

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-19 21:09:07 +02:00
Moritz BarsnickandMichael Niedermayer 66d02d3ca6 align and correct messages regarding bitstream filters 
The messages regarding the recommended use of bitstream filters are somewhat different.
This also adds the ":v" stream specifier to "-bsf h264_mp4toannexb".

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-19 20:18:01 +02:00
Michael Niedermayer b1cf83b3d4 Merge commit 'b977b287f61fea48ecd6251d54a26334213b7ec6' 
* commit 'b977b287f61fea48ecd6251d54a26334213b7ec6':
  vsrc_movie: Avoid a variable indirection in movie_get_frame()

Conflicts:
	libavfilter/src_movie.c

no change as theres no such code in src_movie.c in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-19 19:58:17 +02:00
Michael Niedermayer 746095bc29 Merge commit '6af2930222ee5d8ce19f3b999a78d85a3c457391' 
* commit '6af2930222ee5d8ce19f3b999a78d85a3c457391':
  pcm: Drop av_unused attribute from variable that is always used

Conflicts:
	libavcodec/pcm.c

No change as there is no such av_unused variable in ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-19 19:13:49 +02:00
Michael Niedermayer 4042c8eee1 Merge commit '14d2006ca6c0e2b54784b93560f09e0e19c0a270' 
* commit '14d2006ca6c0e2b54784b93560f09e0e19c0a270':
  pcm: Drop unused variable from DECODE_PLANAR macro

Conflicts:
	libavcodec/pcm.c

No change as the changed code isnt in ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-19 19:11:58 +02:00
Diego Biurrun 67a7695c14 avfilter: Remove unused variable from ff_get_video_buffer() 2014-08-19 09:50:18 -07:00
Michael Niedermayer 580e81fca5 Merge commit 'd456baafb68cd80c0f537f1d843076e4dd853558' 
* commit 'd456baafb68cd80c0f537f1d843076e4dd853558':
  vc1: Add missing parentheses to conditions in vc1_decode_b_mb_intfr()

Conflicts:
	libavcodec/vc1dec.c

See: 1e2ab98460
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-19 18:50:11 +02:00
Michael Niedermayer c18a3b3e8e Merge commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2' 
* commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2':
  vfwcap: Drop fallback VfW defines

Conflicts:
	libavdevice/vfwcap.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-19 18:33:46 +02:00
Michael Niedermayer b07dc81a9e Merge commit '86dfcfd0e30d6645eea2c63c1c60a0550e7c97ea' 
* commit '86dfcfd0e30d6645eea2c63c1c60a0550e7c97ea':
  mov: Drop unused parameter from ff_mov_read_esds()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-19 18:27:51 +02:00
Christophe GisquetandMichael Niedermayer 2ba58bec20 wavpackenc: proper buffer allocation 
The allocation didn't account for headers, that can be easily 79 bytes.
As a result, buffers allocated for a few samples (e.g. 5 in the original
bug) could be undersized.

Fixed ticket #2881.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-19 18:04:25 +02:00
Christophe GisquetandMichael Niedermayer 11a39bdf53 wavpack: report if there is no bits left 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-19 17:47:46 +02:00
rogerdpackandMichael Niedermayer ea97859c8c gdigrab: fix gdi object leak if using mouse 
based on patch from hlszl1983@163.com

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-19 16:07:28 +02:00
Paul B Mahol 9a07c15f48 avcodec/pafaudio: use paf.h instead 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-08-19 13:35:44 +00:00
Paul B Mahol 02dc75f218 avcodec/pafvideo: remove unused header 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-08-19 13:35:02 +00:00
Diego Biurrun b977b287f6 vsrc_movie: Avoid a variable indirection in movie_get_frame() 
This avoids an unused variable warning with MSVC since the variable is
only used in a debug mode printf statement.
 2014-08-19 06:22:08 -07:00
Diego Biurrun 6af2930222 pcm: Drop av_unused attribute from variable that is always used 2014-08-19 06:22:08 -07:00
Diego Biurrun 14d2006ca6 pcm: Drop unused variable from DECODE_PLANAR macro 2014-08-19 06:22:07 -07:00
Diego Biurrun d456baafb6 vc1: Add missing parentheses to conditions in vc1_decode_b_mb_intfr() 2014-08-19 06:22:07 -07:00
Diego Biurrun 8bc52dbd9d vfwcap: Drop fallback VfW defines 
The defines were added long ago when MinGW still lacked them.
 2014-08-19 06:22:07 -07:00
Diego Biurrun 86dfcfd0e3 mov: Drop unused parameter from ff_mov_read_esds() 
This is cleaner and avoids an uninitialized variable warning with MSVC.
 2014-08-19 06:22:07 -07:00
Michael Niedermayer f0e51be8d0 avcodec/proresenc_kostya: allocate 1 slice more to avoid triggering the reallocation warning when the used space is actually less than the allocated 
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-19 14:04:50 +02:00
Michael Niedermayer 76a8cb9d7b avcodec/proresenc_kostya: set initial max_slice_size based on frame_size_upper_bound 
If the initial max_slice_size is 0 then reallocation is disabled for the first
slice.

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-19 14:04:30 +02:00
Christophe GisquetandMichael Niedermayer 1467780772 huffyuvenc: add a non-deterministic option 
Not actually used in huffyuvenc, but rather in setting the frame
threading.

Example for some files:
context=0:       851974   27226   1137281
context=1,ND=0:  471819   22604    972351
context=1,ND=1:  472875   22673    972582

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-19 13:47:18 +02:00
Pavel KoshevoyandMichael Niedermayer 6380f2e367 avfilter/atempo: Flush all buffered input samples 
Fixes ticket #3829

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-19 12:53:09 +02:00
Ben HagenandMichael Niedermayer c9a5497a0b avformat/cinedec: allow number zero in metadata 2014-08-19 11:23:49 +02:00
Lukasz MarekandMichael Niedermayer 3c19744218 lavu/log: add device category macros 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-18 22:37:03 +02:00
Lukasz MarekandMichael Niedermayer 96602f4e34 lavd/pulse_audio_dec: use default source when no input provided 
PulseAudio expilitly requires name of the source.
This patch makes it use default source when not provided.
It simplifies programistic use.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-18 22:36:46 +02:00
Christophe GisquetandMichael Niedermayer 30cac8313a alac: add option to decoded incorrect ALAC 
Prior to 56.1.100, incorrect ALAC files for 24bps content were produced, in
particular not decoding losslessly.

Add an option to allow correctly decoding those streams.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-18 21:59:23 +02:00
Michael Niedermayer cdd0ad7be1 Merge commit '41e1354c101004ccd46dc08d3dd6e956e83a6b51' 
* commit '41e1354c101004ccd46dc08d3dd6e956e83a6b51':
  proresenc: Properly account for alpha plane

Conflicts:
	libavcodec/proresenc_kostya.c

See: 117bc8e6ff
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-18 20:27:41 +02:00
Michael Niedermayer e348a81a66 Merge commit '45ce880a9b3e50cfa088f111dffaf8685bd7bc6b' 
* commit '45ce880a9b3e50cfa088f111dffaf8685bd7bc6b':
  proresenc: Realloc if buffer is too small

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-18 20:21:02 +02:00
Michael Niedermayer e8a2f8cc12 Merge commit '58b68e4fdea22e22178e237bda950b09cc6f363a' 
* commit '58b68e4fdea22e22178e237bda950b09cc6f363a':
  proresenc: Report buffer overflow

Conflicts:
	libavcodec/proresenc_kostya.c

See: 52b81ff463
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-18 20:11:31 +02:00
Michael Niedermayer 43b769b0c4 Merge commit 'b16699f2da9c1d41eff852ec3a0c81f74fd44421' 
* commit 'b16699f2da9c1d41eff852ec3a0c81f74fd44421':
  proresenc: Remove unneeded parameters from encode_alpha_plane()

Conflicts:
	libavcodec/proresenc_kostya.c

See: bf10f09bcc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-18 20:01:14 +02:00
Michael Niedermayer 3f0c76e262 Merge commit '12640e4cbb142be0cd025bcf37f1ea437bdfecd0' 
* commit '12640e4cbb142be0cd025bcf37f1ea437bdfecd0':
  tiff: Return proper error for missing LZMA compression

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-18 19:52:22 +02:00
Michael Niedermayer f47751a56c Merge commit 'dd35d451fbc34795a8d19ac6c281bed53c42a29b' 
* commit 'dd35d451fbc34795a8d19ac6c281bed53c42a29b':
  doc: Change wrong term to avoid confusion

Conflicts:
	doc/developer.texi

No change, as the wrong term is not part of our docs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-18 19:51:40 +02:00