1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

58756 Commits

Author SHA1 Message Date
Diego Biurrun
5a9fcc7d25 build: Add rule for building host-specific object files 2013-12-02 13:13:09 +01:00
Diego Biurrun
ad47771024 build: Add shorthand for HOSTCC compile macro 2013-12-02 13:13:09 +01:00
Lenny Wang
7b2534b0ea libavutil & opencl: remove opencl default device type
CL_DEVICE_TYPE_DEFAULT makes duplicated device entries for each
platform using av_opencl_get_device_list()

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Reviewed-by: highgod0401 <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-02 12:07:27 +01:00
Michael Niedermayer
749eb46d64 configure: put pthread_create() check back
Unbreaks freebsd, broken since f058f384a0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-02 11:11:56 +01:00
Michael Niedermayer
be2312aa8f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  dsputil: x86: Move ff_inv_zigzag_direct16 table init to mpegvideo

If someone optimizes dct_quantize for non x86 SIMD, then this
probably needs to be reverted.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-02 10:59:48 +01:00
Diego Biurrun
7ffaa19570 dsputil: x86: Move ff_inv_zigzag_direct16 table init to mpegvideo
The table is MMX-specific and used nowhere else.
2013-12-02 04:05:18 +01:00
Michael Niedermayer
e3d7a3978b avcodec/h264_refs: improve key frame detection heuristic
Fixes Ticket3186

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-02 02:36:58 +01:00
Michael Niedermayer
ab6ea7a819 avcodec/h264_refs: split conditions of if() up for better readability
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-02 02:12:39 +01:00
Michael Niedermayer
b2c89453dc avformat/avisynth: remove duplicate av_new_packet() call
Found-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-01 22:12:57 +01:00
Michael Niedermayer
003f405caf Merge remote-tracking branch 'qatar/master'
* qatar/master:
  doc: Try to find nonstandard Perl path from the environment

Conflicts:
	doc/texi2pod.pl

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-01 21:50:13 +01:00
Michael Niedermayer
d426863415 Merge commit '3cd612d44789948f72b52944474e0870c5c60964'
* commit '3cd612d44789948f72b52944474e0870c5c60964':
  gitignore: Ignore multilibrary example programs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-01 21:18:11 +01:00
Michael Niedermayer
975110a85e Revert "vf_yadif: move x86 init code to x86/yadif.c"
This reverts commit a87b17f328.
This reduces the amount of non LGPL code, making a relicensing to LGPL
easier

Conflicts:

	libavfilter/vf_yadif.c
	libavfilter/x86/yadif.c
	libavfilter/x86/yadif_template.c
	libavfilter/yadif.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-01 20:26:26 +01:00
Michael Niedermayer
ab00800cde Revert "yadif: add parens around macro parameters"
This reverts commit 49e617f956.
This reduces the amount of non LGPL code, making a relicensing to LGPL
easier

Conflicts:

	libavfilter/vf_yadif.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-01 20:26:26 +01:00
Michael Niedermayer
4ef4bb4a20 avfilter/yadif: Revert "lavfi: convert input/ouput list compound literals to named objects"
This reverts commit 568c70e79e.
This reduces the amount of non LGPL code, making a relicensing to LGPL
easier

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-01 20:26:26 +01:00
Stefano Sabatini
4d028f9280 doc/ffserver: fix misc minor typos 2013-12-01 20:24:49 +01:00
Diego Biurrun
7b05845b15 doc: Try to find nonstandard Perl path from the environment 2013-12-01 12:59:10 -05:00
Anton Khirnov
c46ab34d81 avisynth: make avs_library statically allocated.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-01 13:14:47 +01:00
Stephen Hutchinson
801c186440 avisynth: Move to av_new_packet/av_free_packet.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-01 13:14:42 +01:00
Diego Biurrun
3cd612d447 gitignore: Ignore multilibrary example programs 2013-12-01 12:36:39 +01:00
Carl Eugen Hoyos
2ccc6ff03a Add an Opus and a Speex muxer.
Fixes ticket #3181.
2013-12-01 12:03:34 +01:00
Carl Eugen Hoyos
4ba90392bc Support AC-3 in Sega Dreamcast Sofdec files.
Fixes ticket #3184
2013-12-01 12:02:21 +01:00
Ronald S. Bultje
f068aed7b8 vp9: make decode_coeffs() return value void.
It was previously int and would return error if decode_coeffs_b()
returns an error; however, that can never happen, so refactor all
that code to make all dependent functions return void also (all the
way up to decode_coeffs_sb()).
2013-11-30 16:26:14 -05:00
Ronald S. Bultje
65f41b5c5c vp9: add a new segmentation sample.
The old one didn't use segmentation. One uses segmentation in all frame
types (--aq-mode=1), and the other uses all segmentation features, but
only in inter frames (mbgraph).
2013-11-30 16:26:14 -05:00
Ronald S. Bultje
1d6bb21348 vp9: add fate sample for parallelmode.
This disables backward probability updates, which makes the codec more
friendly for frame-level multi-threading.
2013-11-30 16:26:14 -05:00
Ronald S. Bultje
47c6d9403d vp9: cosmetics. 2013-11-30 16:26:14 -05:00
Ronald S. Bultje
76bd878d95 vp9: add a 2-pass decoding mode, and add frame-mt support.
For a random 1080p sample, decoding time went from 9.7sec (1 threads)
to 6.0sec (2 threads) and 5.2sec (4 threads) in 2-pass decoding mode.
I don't have any samples that use the parallelmode feature, but the
gains should be higher.
2013-11-30 16:26:13 -05:00
Ronald S. Bultje
46955ae430 vp9: allocate 'b', 'block/uvblock' and 'eob/uveob' dynamically. 2013-11-30 16:26:13 -05:00
Ronald S. Bultje
fc7d910b2e vp9: split last/cur_frame from the reference buffers.
We need more information from last/cur_frame than from reference
buffers, so we can use a simplified structure for reference buffers,
and then store mvs and segmentation map information in last/cur.
2013-11-30 16:26:13 -05:00
Ronald S. Bultje
39b244002a vp9: move some entries out of VP9Block into VP9Context.
They aren't really block-related variables in the sense that they are
not block-coded, rather they are state trackers.
2013-11-30 16:26:12 -05:00
Ronald S. Bultje
84d362f020 vp9: split packet parsing into an AVParser. 2013-11-30 16:26:12 -05:00
Ronald S. Bultje
816737ea5d vp9: use proper refcounting.
Based on something similar in libav. Author is likely Anton Khirnov
<anton@khirnov.net> but I'm not sure.
2013-11-30 16:26:12 -05:00
Michael Niedermayer
16f4e2ab27 Makefile: remove version.h on distclean
Without this nothing will remove it even if it isnt generated in newer
versions anymore.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30 21:52:39 +01:00
Timothy Gu
82b2e9cb1d build: rename version.h to libavutil/ffversion.h
Also the libavutil/ffversion.h will be installed.

Rationale:
* Applications might want to know FFmpeg's version besides the individual
  libraries'.
* Avoids file name clash between FFmpeg's ./version.h and lib*/version.h when
  a library source file includes both and is compiled on an out-of-tree build.

Fixes #1769.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30 21:42:55 +01:00
Timothy Gu
c580691091 version.sh: add preprocessing guards
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30 21:42:03 +01:00
Timothy Gu
3c5c4cfa15 version.sh: add a little usage comment
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30 21:17:58 +01:00
Michael Niedermayer
a3b9f53d7b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  dcadec: Add some logging before returning on error

Conflicts:
	libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30 21:09:42 +01:00
Michael Niedermayer
d43d627a24 Merge commit 'f058f384a0d76bfd125f4738dceab7c890186432'
* commit 'f058f384a0d76bfd125f4738dceab7c890186432':
  configure: Do not use pthread_create to check for pthread

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30 20:40:59 +01:00
Michael Niedermayer
a235af93bd avcodec/mpeg4video: fix doxycomments so they are not associated with random unrelated fields
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30 20:30:11 +01:00
Michael Niedermayer
98a6578468 Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
  lavc/srtenc: use bprint for text buffers.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30 17:48:21 +01:00
Timothy Gu
802ba5f557 version.sh: make it independant of version.h file name
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30 15:04:24 +01:00
Stefano Sabatini
f2f17dd874 doc/ffserver: clarify documentation for Feed MaxFileSize option 2013-11-30 14:47:26 +01:00
Stefano Sabatini
8209dd332f doc/ffserver: clarify that note in NoDaemon option documentation 2013-11-30 14:46:53 +01:00
Stefano Sabatini
b58161d6b6 ffserver: print error code description in case of write_header() failure
Improve feedback.
2013-11-30 14:35:33 +01:00
Stefano Sabatini
889509d241 doc/ffserver: add "Detailed description" chapter
Also move FFM section up in the file, and rename it.
2013-11-30 14:35:33 +01:00
Stefano Sabatini
0bacc320c2 doc/ffserver: remove more mentions to LAME and build 2013-11-30 14:35:33 +01:00
Nicolas George
4b1c9b720e lavc/srtenc: use bprint for text buffers.
Fix trac ticket #3120.
2013-11-30 13:57:53 +01:00
James Almer
19e301b9ed lavfi/Makefile: Don't compile lavfutils.c and lswsutils.c if they are not needed
They are only needed by removelogo.
This fixes a link failure in shared builds when compiling with
removelogo disabled but Lavf/SwS enabled

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30 13:29:27 +01:00
Tim Walker
7dc827b709 dcadec: Add some logging before returning on error
Based on a patch by Michael Niedermayer.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-11-30 13:01:35 +01:00
Luca Barbato
f058f384a0 configure: Do not use pthread_create to check for pthread
Certain instrumentation addons leads to a false positive in configure
and link failures at the end of the build phase.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-11-30 13:01:35 +01:00
Michael Niedermayer
bd9de4f594 Merge remote-tracking branch 'cus/stable'
* cus/stable:
  ffmpeg: ensure that -fix_sub_duration doesnt create subtitles with zero duration
  ffmpeg: free empty subtitles as well in transcode_subtitles
  ffmpeg: do not pass possibly undefined subtitles to sub2video_update

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30 05:07:19 +01:00