RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
47,522 Commits 36 Branches 392 Tags 306 MiB
Commit Graph

47522 Commits

Author SHA1 Message Date
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
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
Clément Bœsch 2273b3aaf9 swr: remove unused ONE define. 2012-12-05 23:04:01 +01: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
Reimar Döffinger dd154198b1 Add assert that the avcodec lock is held when initializing static VLC tables. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-12-05 21:01:17 +01:00
Reimar Döffinger 7feef7dbca Acquire lock when initializing parsers. 
This is necessary since they might be initializing or
even using static VLC tables.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-12-05 21:01:17 +01:00
Reimar Döffinger 25fec8595d avcodec: add ff_lock/unlock_avcodec functions. 
Will be used in future patches, together with the
variable that allows checking whether the lock is held.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-12-05 21:01:17 +01:00
Piotr Bandurski 5381960501 wmaenc: add new line to some error messages 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-05 20:29:27 +01:00
Wolfram Gloger 928346091a mpegvideo_parser: fix buffer access beyond end 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-05 20:29:18 +01:00
Reimar Döffinger 58df8befda av_assert should use AV_LOG_PANIC. 
The description of AV_LOG_PANIC 100% matches what av_assert
does, while AV_LOG_FATAL does not really.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-12-05 20:25:32 +01:00
Michael Niedermayer 6d7effa9bd mpegvideo_enc: use av_log() in debug code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-05 19:31:27 +01:00
Michael Niedermayer 911c00e60f motion_est: use av_log() in debug code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-05 19:31:27 +01:00
Michael Niedermayer 7c2481f2d7 j2kenc: remove duplicate debug functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-05 19:31:27 +01:00
Michael Niedermayer 9bb188da96 j2k: avoid printf() useage in debug code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-05 19:31:27 +01:00
Michael Niedermayer b023392f34 mpegvideo: remove #if/define PARANOID code 
This code never did anything as far as i can remember

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-05 19:31:27 +01:00
Paul B Mahol 4012cd6c4f lavc: fix decode_frame() third parameter semantics for rest of video decoders 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-05 18:24:43 +00:00
Michael Niedermayer 835fd779a4 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fate: workaround for slighly broken 'test' shell builtin
  mimic: initialize padding of swap_buf through av_fast_padded_malloc
  eamad: initialize padding of bitstream_buf through av_fast_padded_malloc()
  raw demuxer: initialize end of partial packets

Conflicts:
	tests/fate-run.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-05 17:33:12 +01:00
Justin Ruggles 9d5c62ba5b lavu/opt: do not filter out the initial sign character except for flags 
This allows parsing of special-case negative numbers like decibels.
 2012-12-05 11:23:36 -05:00
Justin Ruggles 5312268b34 eval: treat dB as decibels instead of decibytes 2012-12-05 11:23:36 -05:00
Justin Ruggles ac7eb4cb20 float_dsp: add vector_dmul_scalar() to multiply a vector of doubles 
Include x86-optimized versions for SSE2 and AVX.
 2012-12-05 11:23:36 -05:00
Michael Niedermayer fc1152de41 Merge commit 'df9b9567518f2840d79a4a96b447ebe1aa326408' 
* commit 'df9b9567518f2840d79a4a96b447ebe1aa326408':
  lavc: fix decode_frame() third parameter semantics for video decoders

Conflicts:
	libavcodec/cscd.c
	libavcodec/eamad.c
	libavcodec/ffv1dec.c
	libavcodec/gifdec.c
	libavcodec/h264.c
	libavcodec/iff.c
	libavcodec/mjpegdec.c
	libavcodec/pcx.c
	libavcodec/vp56.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-05 17:20:19 +01:00
Michael Niedermayer 022553e875 Merge commit '387bef95d28019c13c6805cfa4079e59948284e5' 
* commit '387bef95d28019c13c6805cfa4079e59948284e5':
  lavc: factorise setting buffer type in avcodec_default_get_buffer().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-05 17:02:42 +01:00
Michael Niedermayer 83db6cb521 Merge commit 'e57c4706e969afa1f2384481b955ccd9494cddb5' 
* commit 'e57c4706e969afa1f2384481b955ccd9494cddb5':
  lavc: don't reuse audio buffers

This commit causes a 0.5% speedloss for mp3 and 2% for raw pcm, that is
"time ffmpeg" style tested thus includes disk IO, demux and parsing

I would not have merged it if it wasnt required for the "new" buffer API
but sadly it is.
Once the new API is in ill reimplement proper buffer reuse, which will
fix this speedloss. In case we choose not to merge the "new" buffer
API then this commit here should be reverted.

Conflicts:
	libavcodec/internal.h
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-05 16:53:12 +01:00
Michael Niedermayer d2a3f08daf lavc: move ff_init_buffer_info() down to ff_get_buffer() 
and remove redundant code from ff_get_buffer()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-05 15:58:37 +01:00
Michael Niedermayer 2f980cf39a Merge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6' 
* commit 'ff953fecffd3b9a616a046723fb9d4690be032a6':
  lavc: set frame properties in ff_get_buffer().

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-05 15:58:07 +01:00
Michael Niedermayer 874c5b02c4 Merge commit '594d4d5df3c70404168701dd5c90b7e6e5587793' 
* commit '594d4d5df3c70404168701dd5c90b7e6e5587793':
  lavc: add a wrapper for AVCodecContext.get_buffer().

Conflicts:
	libavcodec/4xm.c
	libavcodec/8svx.c
	libavcodec/bmv.c
	libavcodec/cljr.c
	libavcodec/cscd.c
	libavcodec/dnxhddec.c
	libavcodec/dpcm.c
	libavcodec/dpx.c
	libavcodec/eacmv.c
	libavcodec/eamad.c
	libavcodec/frwu.c
	libavcodec/g723_1.c
	libavcodec/gifdec.c
	libavcodec/idcinvideo.c
	libavcodec/iff.c
	libavcodec/indeo3.c
	libavcodec/internal.h
	libavcodec/interplayvideo.c
	libavcodec/kmvc.c
	libavcodec/mpc7.c
	libavcodec/mpegaudiodec.c
	libavcodec/pcx.c
	libavcodec/pngdec.c
	libavcodec/pnmdec.c
	libavcodec/rl2.c
	libavcodec/snow.c
	libavcodec/targa.c
	libavcodec/tscc.c
	libavcodec/txd.c
	libavcodec/utils.c
	libavcodec/v210dec.c
	libavcodec/vb.c
	libavcodec/vmdav.c
	libavcodec/vp56.c
	libavcodec/vqavideo.c
	libavcodec/wavpack.c
	libavcodec/wnv1.c
	libavcodec/xl.c
	libavcodec/yop.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-05 15:18:12 +01:00
Paul B Mahol 4727611d48 ircamenc: 10l do not use avio_skip() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-05 13:46:35 +00:00
Paul B Mahol 4c18562d02 Ensoniq Paris Audio File demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-05 13:01:22 +00:00