virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
47,651 Commits 37 Branches 400 Tags 463 MiB
66dc3ba356
Commit Graph

47651 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
656500c503 lavf: improve help text for avoid_negative_ts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-06 22:06:40 +01:00
Michael Niedermayer
4b6869d6e0 bitstream: make vlc init of static tables thread safe. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-06 21:46:42 +01:00
Clément Bœsch
bbd44f6ca4 lavfi/mp: switch to ff_filter_frame. 2012-12-06 21:11:28 +01:00
Paul B Mahol
586c2528a0 dxa: port to bytestream2 API 
Protects against overreads in input buffer.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-06 19:09:48 +00:00
Paul B Mahol
547b8aeed4 smacker: use meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-06 18:06:52 +00:00
Paul B Mahol
29c3ebf56e siff: return meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-06 18:00:37 +00:00
Paul B Mahol
7510a9a466 lavf/apedec: return meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-06 17:17:49 +00:00
Paul B Mahol
4d1912ff4d huffyuv: return meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-06 16:56:40 +00:00
Paul B Mahol
4a722a5cab huffyuv: check for malloc failures 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-06 16:44:43 +00:00
Justin Ruggles
b64ba37c4c Changelog: add an entry for deprecating the avconv -vol option 2012-12-06 11:33:38 -05:00
Paul B Mahol
7f261ac850 huffyuv: make use of av_fast_padded_malloc() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-06 16:31:54 +00:00
Clément Bœsch
eaa47e7454 lavfi/deshake: small align prettifying. 2012-12-06 16:20:31 +01:00
Clément Bœsch
03778575b9 lavfi/deshake: switch inverted comments. 2012-12-06 16:20:31 +01:00
Clément Bœsch
0678641b7c lavfi/deshake: remove unecessary check before unref. 2012-12-06 16:20:31 +01:00
Clément Bœsch
e7b0e83e96 lavfi/deshake: switch to filter_frame. 2012-12-06 16:20:31 +01:00
Michael Niedermayer
71949ef715 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h264: slice-mt: check master context for valid current_picture_ptr
  h264: slice-mt: get last_pic_dropable from master context
  alacenc: add support for multi-channel encoding

Conflicts:
	Changelog
	libavcodec/alac.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-06 16:14:38 +01:00
Michael Niedermayer
54a71f2e6c Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56' 
* commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56':
  pixdesc: fix yuva 10bit bit depth
  avconv: deprecate the -vol option
  x86: af_volume: add SSE2/SSSE3/AVX-optimized s32 volume scaling
  x86: af_volume: add SSE2-optimized s16 volume scaling

Conflicts:
	ffmpeg.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-06 15:55:47 +01:00
Michael Niedermayer
1bb547192f lavfi: rename af_volume to af_volume_stefano 
This matches the naming style of the new af_volume_justin filter.

Note, Yes i would too prefer having one filter instead of 2.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-06 15:29:23 +01:00
Michael Niedermayer
b38c79bf23 Merge commit 'b384e031daeb1ac612620985e3e5377bc587559c' 
* commit 'b384e031daeb1ac612620985e3e5377bc587559c':
  lavfi: add volume filter

Conflicts:
	Changelog
	libavfilter/Makefile
	libavfilter/af_volume.c
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-06 15:18:59 +01:00
Clément Bœsch
377d201790 lavd/lavfi: fix float.h include. 
float.h is a system header.
 2012-12-06 15:09:47 +01:00
Clément Bœsch
a0b2e8e155 lavfi/silencedetect: use eval builtin to parse dB. 
Also update FATE test to use the dB form.
 2012-12-06 15:08:38 +01:00
Michael Niedermayer
15784c2bab Merge commit '9d5c62ba5b586c80af508b5914934b1c439f6652' 
* commit '9d5c62ba5b586c80af508b5914934b1c439f6652':
  lavu/opt: do not filter out the initial sign character except for flags
  eval: treat dB as decibels instead of decibytes
  float_dsp: add vector_dmul_scalar() to multiply a vector of doubles

Conflicts:
	libavutil/eval.c
	tests/ref/fate/eval

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-06 14:33:38 +01:00
Justin Ruggles
ecc8b02194 x86: float_dsp: fix compilation of ff_vector_dmul_scalar_avx() on x86-32 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2012-12-06 14:11:15 +01:00
Nicolas George
32aedebdc5 lavf: add a concat demuxer. 2012-12-06 14:09:14 +01:00
Stefano Sabatini
c3fa6add58 lavfi/field: switch to filter_frame API 2012-12-06 13:51:34 +01:00
Stefano Sabatini
3942294fd5 lavfi/drawtext: make use of outlink variable in filter_frame() 
Fix warning.
 2012-12-06 13:51:27 +01:00
Paul B Mahol
3bb3cddd96 mmfdec: fix seeking 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-06 11:56:00 +00:00
Clément Bœsch
1e85fd6a47 lavfi/mp: remove dead extern vf_info_t declarations. 2012-12-06 12:52:58 +01:00
anonymous
de42d2a347 lavfi/mp: add ff_ prefix to exported symbols 2012-12-06 12:38:37 +01:00
Clément Bœsch
0f65d56080 Add examples/resampling_audio to .gitignore. 2012-12-06 12:13:01 +01:00
Stefano Sabatini
e8278b9d56 doc/decoders: fix typo in "@Options" 2012-12-06 10:16:10 +01:00
Stefano Sabatini
89920387da examples: add resampling_audio.c file 2012-12-06 10:09:37 +01:00
Janne Grunau
3ab5f7dc13 h264: slice-mt: check master context for valid current_picture_ptr 
Fixes errors in slice based multithreading introduced in 0b300daad2.
 2012-12-06 04:45:04 +01:00
Janne Grunau
24c62ea7a5 h264: slice-mt: get last_pic_dropable from master context 
Fixes fate-h264-conformance-cvnlfi2_sony_h and smllwebdl.mkv from
https://github.com/OpenELEC/OpenELEC.tv/issues/1557 .
 2012-12-06 04:44:57 +01:00
Michael Niedermayer
7885fa7685 ff_lock_avcodec: make the lock state be consistent in case of failure. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-06 03:12:34 +01:00
Michael Niedermayer
2dec950f49 avcodec_open: if obtaining a lock fails, dont attempt to unlock it. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-06 02:52:46 +01:00
Michael Niedermayer
0393cf15db Revert "Acquire lock when initializing parsers." 
This reverts commit 7feef7dbca.

This commit causes assertion failures due to use of parser_init from multiple
threads, for example indirectly by ffmpeg.c and more directly from the
packet read functions.

I dont know how to fix this quickly, and fixing ffmpeg.c leaves
the possibility of other applications being affected.
Crashing the applications until this is resolved is clearly no good
thus this revert, so we have time to think about the problem.

Crashes can be reproduced by using multiple input files in ffmpeg.
 2012-12-06 02:52:46 +01:00
Michael Niedermayer
eed865540a Revert "Add assert that the avcodec lock is held when initializing static VLC tables." 
This reverts commit dd154198b1.
 2012-12-06 02:52:07 +01:00
Michael Niedermayer
d7169280a6 frame_thread_encoder: fix locking while locks are held 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-06 02:51:26 +01:00
Michael Niedermayer
bde6f6eadc vc1dec: prevent v_edge_pos from becoming negative. 
Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-06 02:51:26 +01:00
Michael Niedermayer
b6a7f66f93 resample: remove disabled debug code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-06 02:51:26 +01:00
Clément Bœsch
d3451a9c0f fate/hqdn3d: add -idct simple. 
This should fix FATE failure on ARM. IDCT is required since it's a JPEG
source.
 2012-12-05 23:36:31 +01:00
Janne Grunau
5945c7b35d h264: slice-mt: check master context for valid current_picture_ptr 
Fixes errors in slice based multithreading introduced in 0b300daad2.

CC: libav-stable@libav.org
 2012-12-05 23:16:37 +01:00
Janne Grunau
a8cb1746c5 h264: slice-mt: get last_pic_dropable from master context 
Fixes fate-h264-conformance-cvnlfi2_sony_h and smllwebdl.mkv from
https://github.com/OpenELEC/OpenELEC.tv/issues/1557 .

CC: libav-stable@libav.org
 2012-12-05 23:16:37 +01:00
Clément Bœsch
2273b3aaf9 swr: remove unused ONE define. 2012-12-05 23:04:01 +01:00
Justin Ruggles
5e1bbb8c7e alacenc: add support for multi-channel encoding 2012-12-05 16:13:37 -05:00
Paul B Mahol
9ef29af2e8 cafenc: do not include riff.h 
ff_codec_get_tag() was moved to internal.h

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-05 20:44:28 +00:00
Paul B Mahol
9f66531d46 lavc/dxa: return meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-05 20:28:45 +00:00
Paul B Mahol
0aabd35b62 lavf/dxa: return meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-05 20:18:04 +00:00
Paul B Mahol
c5008135c2 dxa: signal EOF 
Fixes #1948.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-05 20:03:30 +00:00