1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Commit Graph

30582 Commits

Author SHA1 Message Date
Stefano Sabatini
e9f4001a30 wav: propagate ff_get_wav_header() error code in w64_read_header()
Alos fix warning:
wav.c: In function ‘w64_read_header’:
wav.c:546: warning: ‘ret’ may be used uninitialized in this function
2011-05-24 13:34:47 +02:00
Anton Khirnov
b2893ee2f8 msmpeg4: reindent. 2011-05-24 12:37:51 +02:00
Anton Khirnov
57aa765971 lavc: remove msmpeg4v1 encoder.
The encoder has never produced files that could be decoded
with any software and there should be no reason to create
such files anyway.
2011-05-24 12:37:51 +02:00
Carl Eugen Hoyos
d42dce7bb3 Remove avconfig.h and INCINSTDIRs on uninstall. 2011-05-24 10:09:45 +02:00
Justin Ruggles
7f3a7b5c40 ac3enc: add channel coupling support
Channel coupling is an optional AC-3 feature that increases quality by
combining high frequency information from multiple channels into a
single channel. The per-channel high frequency information is sent with
less accuracy in both the frequency and time domains. This allows more
bits to be used for lower frequencies while preserving enough
information to reconstruct the high frequencies.
2011-05-24 07:52:31 +02:00
Michael Niedermayer
af2f797099 partial revert of 01d3ebaf21
Fixes ffplay

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-24 05:19:56 +02:00
Michael Niedermayer
0781e14ec4 fate: reenable frext-pph10i4_panasonic_a after the bitstream has been fixed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-24 04:57:51 +02:00
Michael Niedermayer
26ed595bd0 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  configure: Add -U__STRICT_ANSI__ to CPPFLAGS on Cygwin and DOS.
  aacdec: fix typo in scalefactor clipping check
  fate: fix fate-h264-conformance-frext-pph10i4-panasonic-a crcs.
  fate: update 9/10bit refs.
  h264: Properly set coded_{width, height} when parsing H.264.
  x86 asm: Add SECTION_TEXT to dct32_sse.asm.
  Fix 9/10 bit in swscale.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-24 04:35:08 +02:00
Michael Niedermayer
1bc81bf981 avcodec_find_decoder: prefer non experimental decoders.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-24 01:31:54 +02:00
Michael Niedermayer
df0adc806b j2kdec: mark as CODEC_CAP_EXPERIMENTAL
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-24 01:31:54 +02:00
Rukhsana Ruby
88e9397ef1 j2k[c/h] j2kdec.c: Implement 2 code block styles 2011-05-24 01:31:54 +02:00
Rukhsana Ruby
cbe60f3451 j2k: Add void as the parameter of function ff_j2k_init_tier1_luts 2011-05-24 01:31:54 +02:00
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
Diego Biurrun
a7a187a1be configure: Add -U__STRICT_ANSI__ to CPPFLAGS on Cygwin and DOS.
In -std=c99 mode GCC defines __STRICT_ANSI__ to hide non-ANSI interfaces.
This causes declarations for some POSIX functions to be omitted from system
headers, which causes compilation failures.
2011-05-23 22:51:14 +02:00
alahuja
5f3c436bdf muxers.texi changes for mkv/webm options 2011-05-23 21:57:55 +02:00
Justin Ruggles
cef7d70181 aacdec: fix typo in scalefactor clipping check 2011-05-23 15:56:52 -04: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
Ronald S. Bultje
b51021da7b fate: fix fate-h264-conformance-frext-pph10i4-panasonic-a crcs.
The sample on rsync was corrupt, this one is now bitexact w.r.t. JM.
2011-05-23 08:44:31 -04:00
Ronald S. Bultje
845807494b fate: update 9/10bit refs. 2011-05-23 08:21:50 -04:00
Felipe Contreras
b47904d158 h264: Properly set coded_{width, height} when parsing H.264.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-05-23 13:15:55 +02:00
Dave Yeo
a10fb79070 x86 asm: Add SECTION_TEXT to dct32_sse.asm.
This fixes the following error on OS/2:
error: segment name `.text align=16' not recognized

Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-05-23 12:47:53 +02:00
Kieran Kunhya
6465c820da Fix 9/10 bit in swscale.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-05-23 06:46:14 -04: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