RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
30,163 Commits 36 Branches 398 Tags 242 MiB
Commit Graph

30163 Commits

Author SHA1 Message Date
Kamil Nowosad 83654c7b1b Add Kamil Nowosads j2k code. 
This needs work but it should not rot in soc svn.
 2011-05-24 01:31:53 +02:00
Aurelien Jacobs 4c509fe305 matroska: cleanup handling of video stereo mode 2011-05-24 01:12:19 +02:00
Stefano Sabatini 2ef241c09f oggdec: use av_dlog() 
Simplify.
 2011-05-24 00:43:00 +02:00
Stefano Sabatini 6b4c0be558 mem: define the MAX_MALLOC_SIZE constant and use it in place of INT_MAX 
This makes re-dimensionating the constant simpler, since now it is
defined only in one place.
 2011-05-24 00:41:14 +02:00
alahuja 5f3c436bdf muxers.texi changes for mkv/webm options 2011-05-23 21:57:55 +02:00
Michael Niedermayer bed12e24ff mpegaudio: Correct license header 
To the best of my knowledge the author has not agreed to the change
from ffmpeg->libav thus i revert it.
 2011-05-23 17:33:03 +02:00
jan gerber 02260ccc3b add 5.1 to stereo downmix to resample.c 
this is based on previous 6to2channel-resample.patch from ffmpeg2theora
but updated to work with trunk and using av_clip_int16.
 2011-05-23 17:22:02 +02:00
Michael Niedermayer 01a73d6cef Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ffmpeg: Don't trigger url_interrupt_cb on the first signal
  avoptions: Check the return value from av_get_number
  dct32_sse: eliminate some spills
  Fix dct32() compilation with --disable-yasm

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-23 04:29:51 +02:00
Carl Eugen Hoyos 0753721ed1 Do not ask for samples if a specific channel layout was requested. 2011-05-23 01:23:33 +02:00
Stefano Sabatini 458f20bc75 libx264: specify field for default union values in options 
Fix warnings.
 2011-05-22 23:13:48 +02:00
Michael Niedermayer f455f46455 movdec: dont divide by zero when stts_data[0].duration = 0. 
Fixes ticket223
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-22 21:31:28 +02:00
Michael Niedermayer a0cd98b594 Fix ticket127 
This fixes detectiion of slightly too big dummy frames.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-22 21:31:27 +02:00
Michael Niedermayer 94ea17075b dct32: Replacing libav by ffmpeg in the license header with the authors permission. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-22 21:31:27 +02:00
Martin Storsjö a121754852 ffmpeg: Don't trigger url_interrupt_cb on the first signal 
Currently, the url_interrupt_cb callback will abort all IO
after the first received signal. This makes the output files
from e.g. the mov muxer to be unreadable if the transcode is
aborted with ctrl+c.

After this patch, the first signal cleanly breaks out of
the transcoding loop, but won't forcibly abort all IO.
After the second signal is received, the url_interrupt_cb
callback will abort all IO.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-05-22 22:06:20 +03:00
Martin Storsjö 8089b7fa8c avoptions: Check the return value from av_get_number 
This avoids doing a division by zero if the option wasn't found,
or wasn't an option of an appropriate type.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-05-22 22:06:17 +03:00
Stefano Sabatini 5045786b7e lavf: fix style for avformat_alloc_output_context2() 
More consistent/readable.
 2011-05-22 20:04:11 +02:00
Stefano Sabatini 5ecdfd008b lavf: deprecate avformat_alloc_output_context() in favor of avformat_alloc_output_context2() 
The new function accepts a slightly more intuitive order of paramters,
and returns an error code, thus allowing applications to report a
meaningful error message.
 2011-05-22 20:01:31 +02:00
Stefano Sabatini 83db719777 lavfi: make vsrc_buffer.h header public 
Address trac issue #33.
 2011-05-22 19:30:47 +02:00
Loren Merritt 422b2362fc dct32_sse: eliminate some spills 
125->104 cycles on penryn (x86_64 only)
 2011-05-22 19:27:18 +02:00
Vitor Sessak e6c1791b47 Fix compilation with --disable-yasm. 2011-05-22 13:41:13 +02:00
Vitor Sessak 165c7c420d Fix dct32() compilation with --disable-yasm 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-05-22 07:10:19 -04:00
Michael Niedermayer bf8bb94322 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ffmpeg: get rid of the -vglobal option.
  dct32: Add AVX implementation of 32-point DCT
  dct32: Change pass 6 permutation to allow for AVX implementation
  dct32: port SSE 32-point DCT to YASM
  multiple inclusion guard cleanup
  avio: document buffer must created with av_malloc() and friends
  avio: check AVIOContext malloc failure
  swscale: point out an alternative to sws_getContext
  svq3: Do initialization after parsing the extradata
  add changelog entries for 0.7_beta2
  mp3lame: add #include required for AV_RB32 macro.

Conflicts:
	Changelog
	libavcodec/svq3.c
	libavcodec/x86/dct32_sse.c
	libavfilter/vsrc_buffer.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-22 04:53:19 +02:00
Michael Niedermayer 33adcdb531 mpeg2dec: Fix lowres 3 
Fixes ticket212

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-22 03:32:08 +02:00
Stefano Sabatini af2ed4b748 lavfi: bump minor and add changelog entry after the split filter addition 2011-05-22 02:43:48 +02:00
Stefano Sabatini 8a5b71d0c3 vf_split: add documentation to filters.texi 2011-05-22 02:43:47 +02:00
Stefano Sabatini 6f5a145be1 vf_split: give more meaningful names to the output pads 
Rename "default" -> "output1", "default2" -> output2.
 2011-05-22 02:43:47 +02:00
Stefano Sabatini de1100a00a vf_split: define draw_slice() before end_frame() 
Improve logical coherence, fix nit.
 2011-05-22 02:43:46 +02:00
Stefano Sabatini 88fc2e411e vf_split: add description 2011-05-22 02:43:46 +02:00
Stefano Sabatini 7d5297b343 vf_split: fix various nits 2011-05-22 02:43:46 +02:00
Michael Niedermayer eb97d4d611 wmadec: avoid infinit loop. 
Fixes ticket183

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-22 02:33:03 +02:00
Ramiro Polla a13fec8a9c DirectShow capture: Fix build 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-21 21:53:15 +02:00
Anton Khirnov 71cc331cab ffmpeg: get rid of the -vglobal option. 
It's badly documented and does the same thing as -flags global_header,
so it's redundant.
 2011-05-21 21:25:58 +02:00
Vitor Sessak 6204feb160 dct32: Add AVX implementation of 32-point DCT 2011-05-21 17:42:26 +02:00
Vitor Sessak 4e653b98c8 dct32: Change pass 6 permutation to allow for AVX implementation 2011-05-21 17:42:26 +02:00
Vitor Sessak 3758eb0eb9 dct32: port SSE 32-point DCT to YASM 2011-05-21 17:42:26 +02:00
Kirill Gavrilov e6ec9212c5 matroska: switch stereo mode from int to string and add support in the demuxer too 2011-05-21 17:23:30 +02:00
Kirill Gavrilov 69a83da5d4 matroska: cosmetics 2011-05-21 17:23:30 +02:00
Alok Ahuja 8dd12b077b Create a stereo_mode metadata tag to specify the stereo 3d video layout using the StereoMode tag in a matroska/webm video track. 2011-05-21 17:23:29 +02:00
Bobby Bingham a38a00eddf libavfilter: vf_split from soc. 
Commited by michael, for detailed authorship see soc repo
 2011-05-21 17:23:29 +02:00
Ramiro Polla 95eb2e3a38 DirectShow capture support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-21 17:23:14 +02:00
Diego Biurrun 153382e1b6 multiple inclusion guard cleanup 
Add missing multiple inclusion guards; clean up #endif comments;
add missing library prefixes; keep guard names consistent.
 2011-05-21 13:48:10 +02:00
Can Wu d49051e074 avio: document buffer must created with av_malloc() and friends 
Else a later buffer resize in ffio_set_buf_size() will ABORT.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-21 13:42:50 +02:00
Can Wu 9e2dabed4a avio: check AVIOContext malloc failure 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-21 13:42:50 +02:00
Clément Bœsch 7d4c4394b5 swscale: point out an alternative to sws_getContext 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-21 13:42:50 +02:00
Ronald S. Bultje cdca7c378e svq3: Do initialization after parsing the extradata 
If done before, some parameters aren't known yet.

With svq3/rtp, initializing before some parameters are known
can lead to calling av_malloc(0), which on OS X currently returns
broken pointers.
 2011-05-21 07:40:56 -04:00
Carl Eugen Hoyos f8c49d02b0 Fix channel_layout documentation. 
libavformat/riff.c has been writing channel_layout for as long as
the field exists.
 2011-05-21 11:18:54 +02:00
Reinhard Tartler 21bbca5b44 add changelog entries for 0.7_beta2 2011-05-21 09:06:58 +02:00
Michael Niedermayer 6d32bcd770 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: make executable again
  LATM/AAC: Free previously initialized context on reinit.
  configure: Do not unconditionally add -Wall to host CFLAGS.
  configure: Set OS/2 objformat to a.out.
  Add support for a.out object format to assembler macros.
  fate: disable threading for encoding
  fate: add comment field
  fate: allow overriding default build and install dirs
  mpegtsenc: Add an AVClass pointer to the private data
  mpegaudio: clean up #includes
  mpegaudio: move all header parsing to mpegaudiodecheader.[ch]

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-21 05:32:03 +02:00
Mike William 840238b870 ffserver: dont just crash 
With changes from ubitux.
 2011-05-21 04:50:59 +02:00
Maksym Veremeyenko ab1c19efc5 fix ffserver's SIGSEGV 2011-05-21 04:39:20 +02:00