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

44855 Commits

Author SHA1 Message Date
Stefano Sabatini dead4580e2 lavfi/avcodec: apply cosmetics style fixes 2012-09-14 11:06:40 +02:00
Stefano Sabatini 8d0e871f25 ffprobe: kill initializers with nested union field definition 
The c99-to-c89 converter (for MSVC support) doesn't currently handle
designated initializers or compound literals with nested unions or
structs.

This is apparently the only place where this construct is used in the
FFmpeg codebase.
 2012-09-14 10:47:08 +02:00
Stefano Sabatini 5e99a23b2d ffprobe: avoid potentially lossy long long int -> double cast in value_string() 
Previously the cast long long int -> double was always performed (and
then the double was converted back to long long int) even when it was
avoidable.
 2012-09-14 10:42:54 +02:00
Ben Jackson e3329474a3 pthread: Avoid crashes/odd behavior caused by spurious wakeups 
pthread_wait_cond can wake up for no reason (Wikipedia: Spurious_wakeup).
The FF_THREAD_SLICE thread mechanism could spontaneously execute jobs or
allow the caller of avctx->execute to return before all jobs were complete.
This adds tests to both cases to ensure the wakeup is real.

Signed-off-by: Ben Jackson <ben@ben.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-14 06:36:55 +02:00
Michael Niedermayer 93b240f4a5 mpegaudio_parser: reset state to prevent it to be random 
Fixes Ticket1718

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-14 05:55:11 +02:00
Michael Niedermayer 570931d411 aacpsy: psy_3gpp_analyze_channel() handle energy == 0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-14 03:27:25 +02:00
Michael Niedermayer 413b32f808 aacpsy: calc_reduction_3gpp() handle active_lines = 0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-14 03:26:19 +02:00
Michael Niedermayer 062091f87f compute_pkt_fields2: dont interpret max_b_frames of <0 as there being b frames. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-14 02:30:00 +02:00
Diego Biurrun 58139e141b x86: dsputil: Move Xvid IDCT put/add functions to a more suitable place 2012-09-14 01:59:47 +02:00
Michael Niedermayer c21f81999a mpegaudioenc: replace pow(2,.. by exp2( 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-13 22:44:42 +02:00
Stefano Sabatini 51fa653829 examples/decoding_encoding: clarify operations in the usage message 2012-09-13 22:19:45 +02:00
Martin Storsjö 18d8825517 trasher: Include all the necessary headers 
The missing headers are required for errno and for strerror.
This fixes building of this tool on mingw32ce.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-13 23:12:54 +03:00
Diego Biurrun 2017f0fdb7 x86: Remove some leftover declarations for non-existent functions 2012-09-13 21:38:47 +02:00
Stefano Sabatini bcf93f78a5 examples/decoding_encoding: replace "picture" with "frame" in encode_example() 
The use of "picture" in place of "frame" is confusing.
 2012-09-13 20:49:59 +02:00
Stefano Sabatini 70b671a283 examples/decoding_encoding: apply various message log fixes 2012-09-13 20:49:59 +02:00
Mans Rullgard 8ff7857861 ARM: libavresample: NEON optimised generic fltp to s16 conversion 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-09-13 19:15:43 +01:00
Mans Rullgard d26de339af ARM: libavresample: NEON optimised stereo fltp to s16 conversion 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-09-13 19:15:43 +01:00
Mans Rullgard 643b5b794f ARM: libavresample: NEON optimised flat float to s16 conversion 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-09-13 19:15:42 +01:00
Nicolas George 8ad54a44eb lavfi: check that buffer and link properties match. 2012-09-13 20:09:53 +02:00
Nicolas George c262ddb8c5 lavfi: set sample_rate in the default allocator. 2012-09-13 20:09:53 +02:00
Michael Niedermayer 9d89d1d484 swr/resample: mark mm_flags as potentially unused 
They are unused when asm is disabled

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-13 19:31:02 +02:00
Michael Niedermayer bd3977267e x86_cpu.h: newline at the end to shutup some warnings in opencc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-13 19:31:02 +02:00
Derek Buitenhuis 59db014b5b Revert "lavc/libx264: remap X264_LOG_INFO loglevel from AV_LOG_INFO to VERBOSE" 
You should not need to enable verbose logging and all the output that comes
with it in order to get things like the obtained bitrate from a first
pass encode. Many things parse this output.

Also, since it is marked as info in libx264, it should be marked as
info in libavcodec as well.

This reverts commit 911519caec.
 2012-09-13 10:57:50 -04:00
Michael Niedermayer 75f3e0ad95 mpegvideo: skip ff_print_debug_info() for VDPAU 
Based on code by: MEANX / gruntster (Avidemux Rev 7990 — 2012-05-30 13:02:27)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-13 16:22:42 +02:00
Michael Niedermayer bc3d5173cc libavformat.v: export ffurl_protocol_next 
This is used by avidemux, and is likely usefull to others too.

Patch by: gruntster (Avidemux Rev 7990 — 2012-05-30 13:02:27)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-13 16:21:25 +02:00
Michael Niedermayer 0ed0f2e566 sws: revert: "swscale: Remove two bogus asserts" 
Also change them to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-13 15:53:05 +02:00
Michael Niedermayer e3e09f2bad Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  os_support: Choose between direct.h and io.h using a configure check
  os_support: Include io.h instead of direct.h on mingw32ce
  x86: ac3dsp: Only refer to the ac3_downmix_sse symbol if it has been declared
  swscale: Remove two bogus asserts
  ac3: move ac3_downmix() from dsputil to ac3dsp
  lavr/audio_mix_matrix: acknowledge the existence of LFE2.
  mlp_parser: avoid mapping multiple disctinct TrueHD channels to the same Libav channel.
  lavu/audioconvert: add a second low frequency channel.

Conflicts:
	doc/APIchanges
	libavcodec/ac3dsp.c
	libavcodec/ac3dsp.h
	libavcodec/mlp_parser.c
	libavutil/audioconvert.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-13 15:35:50 +02:00
Michael Niedermayer c942e8b1d7 Merge commit '07584eaf4a95db3f11d3bc411f9786932829e82b' 
* commit '07584eaf4a95db3f11d3bc411f9786932829e82b':
  mpegts: check substreams before discarding
  Add a smooth streaming segmenter muxer
  file: Add an avoption for disabling truncating existing files on open
  img2dec: always close AVIOContexts
  rtpdec_jpeg: Error out on other unsupported type values as well
  rtpdec_jpeg: Disallow using the reserved q values
  rtpdec_jpeg: Fold the default qtables case into an existing if statement
  rtpdec_jpeg: Store and reuse old qtables for q values 128-254
  rtpdec_jpeg: Simplify the calculation of the number of qtables
  rtpdec_jpeg: Add more comments about the fields in the SOF0 section
  rtpdec_jpeg: Clarify where the subsampling magic numbers come from
  rtpdec_jpeg: Don't use a bitstream writer for the EOI marker
  rtpdec_jpeg: Don't needlessly use a bitstream writer for the header
  rtpdec_jpeg: Simplify writing of the jpeg header
  rtpdec_jpeg: Merge two if statements
  rtpdec_jpeg: Write the DHT section properly

Conflicts:
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-13 15:22:16 +02:00
Martin Storsjö ca6b544ac9 os_support: Choose between direct.h and io.h using a configure check 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-13 14:56:54 +03:00
Martin Storsjö 7b07fab567 os_support: Include io.h instead of direct.h on mingw32ce 
Windows CE doesn't have neither mkdir nor _mkdir officially (only
CreateDirectoryW), but mingw32ce has compat wrappers with these names
(declared in io.h since direct.h is unavailable).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-13 13:52:50 +03:00
Martin Storsjö 91ff4e83ca x86: ac3dsp: Only refer to the ac3_downmix_sse symbol if it has been declared 
This fixes building without inline assembly.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-13 13:51:52 +03:00
Diego Biurrun b9141aa346 swscale: Remove two bogus asserts 2012-09-13 12:13:28 +02:00
Nicolas George b5bea2f960 lavfi/aresample: set buffer properties after copy. 
The aresample filter changes the format, layout and/or sample rate,
it can not copy them blindly from its input.

Related to trac ticket #1671.
 2012-09-13 12:05:19 +02:00
Mans Rullgard 97cb9236cf ac3: move ac3_downmix() from dsputil to ac3dsp 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-09-12 23:39:50 +01:00
Tim Walker b901c30da6 lavr/audio_mix_matrix: acknowledge the existence of LFE2. 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-09-12 18:26:53 -04:00
Tim Walker 3844572887 mlp_parser: avoid mapping multiple disctinct TrueHD channels to the same Libav channel. 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-09-12 18:26:53 -04:00
Tim Walker 8919fee7d2 lavu/audioconvert: add a second low frequency channel. 
Can be used by DTS-HD, TrueHD and E-AC-3, among others.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-09-12 18:26:53 -04:00
Christian Schmidt 07584eaf4a mpegts: check substreams before discarding 
Allow to extract the AC3 core from TrueHD with the "copy" codec.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-09-12 23:43:53 +02:00
Martin Storsjö 62c9ae11a7 Add a smooth streaming segmenter muxer 
This muxer splits the output from the ismv muxer into individual
files, in realtime.

The same can also be done by the standalone tool ismindex, but this
muxer is needed for doing it in realtime (especially for live
streams that need extra handling for updating the lookahead fields
in the fragment headers).

Using this muxer, one can deliver live smooth streaming from a
normal static file web server. (Using ismindex, one can deliver
premade smooth streaming files from a static file web server,
or prepare files for serving with IIS.)

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-12 23:42:16 +03:00
Martin Storsjö 29a9b12b10 file: Add an avoption for disabling truncating existing files on open 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-12 23:42:09 +03:00
Michael Niedermayer ddabecbbf5 vc1dec: export adv profile color format indication 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-12 21:12:18 +02:00
Michael Niedermayer 2de8877689 asfdec: invert SAR 
It appears this was wrong

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-12 20:35:09 +02:00
Michael Niedermayer ddc9bc7721 configure: try to support clang on netbsd 
The headers on netbsd are not fully C99 compatible which leads to multiple
definitions of symbols in clang bit not with gcc.
AFAIK this has been fixed in netbsd trunk (didnt check though)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-12 19:37:29 +02:00
Tomas Härdin 5e3572893d img2dec: always close AVIOContexts 
Zero sized files would cause the contexts to leak away.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-09-12 14:31:09 +02:00
Carl Eugen Hoyos 8e082df0f4 Support decoding of monochrome tiff images without bpp tag. 2012-09-12 13:33:57 +02:00
Carl Eugen Hoyos 7680d99b43 Fix muxing mjpeg in swf. 2012-09-12 13:08:27 +02:00
Michael Niedermayer ac0f1ae64b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  utvideoenc: Add missing AV_ prefix to codec ID
  avserver: Add missing #include for av_gettime()
  configure: Only disable aligned stack on MSVC on 32 bit
  configure: indentation cosmetics

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-12 11:46:47 +02:00
Martin Storsjö c3bcd22ed3 rtpdec_jpeg: Error out on other unsupported type values as well 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-12 12:10:56 +03:00
Martin Storsjö 1743938df1 rtpdec_jpeg: Disallow using the reserved q values 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-12 12:10:45 +03:00
Martin Storsjö 1de9317bd0 rtpdec_jpeg: Fold the default qtables case into an existing if statement 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-12 12:10:32 +03:00