]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Fri, 6 Dec 2013 02:55:12 +0000 (03:55 +0100)]
Merge commit '
ac1fc92ea410c396594fcd79f5d4491fe6a8cc90 '
* commit '
ac1fc92ea410c396594fcd79f5d4491fe6a8cc90 ':
vc1dec: move setting repeat_pict after frame_start() has been called.
Conflicts:
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 02:46:42 +0000 (03:46 +0100)]
Merge commit '
282c6a1a0ef3e8c8e180c15b39cfe5b89704d848 '
* commit '
282c6a1a0ef3e8c8e180c15b39cfe5b89704d848 ':
mpegvideo: make ff_release_unused_pictures() static
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 02:19:37 +0000 (03:19 +0100)]
Merge commit '
c99307caee01441cfde24f3b7b0db3037b7022dc '
* commit '
c99307caee01441cfde24f3b7b0db3037b7022dc ':
mpegvideo: make frame_size_alloc() static.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 02:04:32 +0000 (03:04 +0100)]
Merge commit '
0b0a7a751de02464a33717e70352f696372ba1c4 '
* commit '
0b0a7a751de02464a33717e70352f696372ba1c4 ':
mpegvideo: move encode-only parts of common_end() to encode_end()
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 01:54:45 +0000 (02:54 +0100)]
Merge commit '
d0d111d0592bfd6b2b8bcd2321986c0fc493455d '
* commit '
d0d111d0592bfd6b2b8bcd2321986c0fc493455d ':
mpegvideo: remove commented out cruft from ff_MPV_frame_end()
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 01:38:30 +0000 (02:38 +0100)]
avcodec/mpegvideo_enc: fix linesizes in frame_end()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 01:37:51 +0000 (02:37 +0100)]
Merge commit '
381a722562bcc0b623acf6a00a583fe989bcb72a '
* commit '
381a722562bcc0b623acf6a00a583fe989bcb72a ':
mpegvideo: split the encoding-only parts of ff_MPV_frame_end() into a separate function
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 01:18:44 +0000 (02:18 +0100)]
Merge commit '
b7254288d222013e20539c530b1ec5d324ed5352 '
* commit '
b7254288d222013e20539c530b1ec5d324ed5352 ':
mpegvideo: do not update last_non_b_pict_type in update_thread_context()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 01:12:11 +0000 (02:12 +0100)]
Merge commit '
1f8eb69079880ef1f394c498dfdf471f91222a06 '
* commit '
1f8eb69079880ef1f394c498dfdf471f91222a06 ':
mpegvideo: move encoding-only initialization from common_init() to encode_init()
Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 00:58:28 +0000 (01:58 +0100)]
Merge commit '
bedf952bb80ae26427854dcde56c139ecb87d4a0 '
* commit '
bedf952bb80ae26427854dcde56c139ecb87d4a0 ':
mpegvideo: move setting encoding-only vars from common_defaults() to encode_defaults()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 00:52:41 +0000 (01:52 +0100)]
Merge commit '
2cab011f0f02fcff8a0629a611bcac2f0459f04a '
* commit '
2cab011f0f02fcff8a0629a611bcac2f0459f04a ':
mpegvideo: don't copy input_picture_number in update_thread_context()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 00:45:25 +0000 (01:45 +0100)]
Merge commit '
ff7ffe48097f32417781fe8b2b417eff05a52c55 '
* commit '
ff7ffe48097f32417781fe8b2b417eff05a52c55 ':
mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContext
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 00:38:55 +0000 (01:38 +0100)]
Merge commit '
f7d228676cb7669059889c4225c8a8dc56708c24 '
* commit '
f7d228676cb7669059889c4225c8a8dc56708c24 ':
mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContext
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 00:27:53 +0000 (01:27 +0100)]
Merge commit '
a097f0049b28dc3ed13625e4a42619292c92492f '
* commit '
a097f0049b28dc3ed13625e4a42619292c92492f ':
mpeg12dec: move first_slice from MpegEncContext to Mpeg1Context
Conflicts:
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 00:21:28 +0000 (01:21 +0100)]
Merge commit '
ff300e435e5337b03dc7a8f1c0be6c9937059c1e '
* commit '
ff300e435e5337b03dc7a8f1c0be6c9937059c1e ':
mpegvideo: remove an unused variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Dec 2013 00:14:46 +0000 (01:14 +0100)]
Merge commit '
e41ff4210ac1192c62de3052b33a38c7bcf772f2 '
* commit '
e41ff4210ac1192c62de3052b33a38c7bcf772f2 ':
mpeg4videodec: move use_intra_dc_vlc from MpegEncContext to Mpeg4DecContext
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 5 Dec 2013 20:50:14 +0000 (17:50 -0300)]
Add Windows resource file support for shared libraries
Originally written by James Almer <jamrial@gmail.com>
With the following contributions by Timothy Gu <timothygu99@gmail.com>
* Use descriptions of libraries from the pkg-config file generation function
* Use "FFmpeg Project" as CompanyName (suggested by Alexander Strasser)
* Use "FFmpeg" for ProductName as MSDN says "name of the product with which the
file is distributed" [1].
* Use FFmpeg's version (N-xxxxx-gxxxxxxx) for ProductVersion per MSDN [1].
* Only build the .rc files when --enable-small is not enabled.
[1] http://msdn.microsoft.com/en-us/library/windows/desktop/
aa381058 .aspx
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 5 Dec 2013 20:17:21 +0000 (21:17 +0100)]
Ignore es_map_length when parsing mpeg program stream map.
Fixes ticket #3195.
Michael Niedermayer [Thu, 5 Dec 2013 16:38:25 +0000 (17:38 +0100)]
avformat/mov: calculate rfps from the first 100 frames of the index
This reduces the amount of frames that need to be demuxed in av_find_stream_info()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Dec 2013 15:56:17 +0000 (16:56 +0100)]
avformat/utils: factor rfps calculation out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Dec 2013 15:06:24 +0000 (16:06 +0100)]
avformat/utils: provide more IO statistics in debug output at start and end of av_find_streaminfo()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Dec 2013 13:08:06 +0000 (14:08 +0100)]
avcodec/mjpegenc: use av_log2_16bit() in encode_block()
This reduces the number of operations done per non zero coefficient
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sat, 30 Nov 2013 17:36:00 +0000 (18:36 +0100)]
vc1dec: move setting repeat_pict after frame_start() has been called.
This will allow removing the hacks where each decoder sets
current_picture_ptr on its own.
Anton Khirnov [Sat, 30 Nov 2013 17:07:06 +0000 (18:07 +0100)]
mpegvideo: make ff_release_unused_pictures() static
It is only called from one place in mpegvideo.c now. Also remove the
remove_current parameter, which is always 1.
Anton Khirnov [Sat, 30 Nov 2013 10:58:42 +0000 (11:58 +0100)]
mpegvideo: make frame_size_alloc() static.
It is not called from outside of mpegvideo.c anymore.
Anton Khirnov [Sat, 30 Nov 2013 10:50:09 +0000 (11:50 +0100)]
mpegvideo: move encode-only parts of common_end() to encode_end()
Anton Khirnov [Sat, 30 Nov 2013 10:35:50 +0000 (11:35 +0100)]
mpegvideo: remove commented out cruft from ff_MPV_frame_end()
Anton Khirnov [Sat, 30 Nov 2013 10:34:37 +0000 (11:34 +0100)]
mpegvideo: split the encoding-only parts of ff_MPV_frame_end() into a separate function
Anton Khirnov [Sat, 30 Nov 2013 10:32:25 +0000 (11:32 +0100)]
mpegvideo: do not update last_non_b_pict_type in update_thread_context()
It is used for encoding only.
Anton Khirnov [Sat, 30 Nov 2013 10:10:53 +0000 (11:10 +0100)]
mpegvideo: move encoding-only initialization from common_init() to encode_init()
Anton Khirnov [Sat, 30 Nov 2013 09:50:20 +0000 (10:50 +0100)]
mpegvideo: move setting encoding-only vars from common_defaults() to encode_defaults()
Anton Khirnov [Sat, 30 Nov 2013 09:47:52 +0000 (10:47 +0100)]
mpegvideo: don't copy input_picture_number in update_thread_context()
It is encoding-only, frame threading is not used for encoding.
Anton Khirnov [Fri, 29 Nov 2013 21:26:15 +0000 (22:26 +0100)]
mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContext
Anton Khirnov [Fri, 29 Nov 2013 21:26:15 +0000 (22:26 +0100)]
mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContext
Anton Khirnov [Fri, 29 Nov 2013 21:26:15 +0000 (22:26 +0100)]
mpeg12dec: move first_slice from MpegEncContext to Mpeg1Context
Anton Khirnov [Fri, 29 Nov 2013 21:18:15 +0000 (22:18 +0100)]
mpegvideo: remove an unused variable
Anton Khirnov [Tue, 26 Nov 2013 13:34:52 +0000 (14:34 +0100)]
mpeg4videodec: move use_intra_dc_vlc from MpegEncContext to Mpeg4DecContext
Michael Niedermayer [Thu, 5 Dec 2013 10:55:38 +0000 (11:55 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: Initialize mmxext after amd3dnow optimizations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Dec 2013 02:53:39 +0000 (03:53 +0100)]
avcodec/cavsdec: print error messages in case of errors
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Dec 2013 02:51:08 +0000 (03:51 +0100)]
avcodec/cavsdec: use more specific error codes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Dec 2013 01:17:15 +0000 (02:17 +0100)]
avcodec/cavsdec: print warning if no frame has been decoded
Fixes ticket3128
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Dec 2013 01:16:59 +0000 (02:16 +0100)]
avcodec/cavsdec: reset stc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Dec 2013 00:41:10 +0000 (01:41 +0100)]
avcodec/cabac: force get_cabac to be not inlined
works around bug in gccs inline asm register assignment
Fixes Ticket3177
gcc from 4.4 to 4.6 is affected at least, no non affected gccs known
clang seems not affected
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Dec 2013 21:05:11 +0000 (22:05 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Detect msvcrt libc with a CPP check instead of a link check
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Dec 2013 19:50:11 +0000 (20:50 +0100)]
Merge commit '
5ec467328122b80fac94c2d5e3e7540d50381868 '
* commit '
5ec467328122b80fac94c2d5e3e7540d50381868 ':
configure: Add detected C library and host compiler to informative output
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Dec 2013 19:25:43 +0000 (20:25 +0100)]
swresample: use the internal buffer for resampling the last few samples
Fixes out of array read
Fixes Ticket3193
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 30 Sep 2013 13:04:44 +0000 (15:04 +0200)]
x86: Initialize mmxext after amd3dnow optimizations
The mmxext optimizations should be at least equally fast if available and
amd3dnow optimizations are being deprecated. Thus the former should
override the latter, not the other way around.
Diego Biurrun [Wed, 4 Dec 2013 15:25:04 +0000 (10:25 -0500)]
configure: Detect msvcrt libc with a CPP check instead of a link check
Simplifies host/target libc detection splitting.
Diego Biurrun [Thu, 28 Feb 2013 15:06:39 +0000 (16:06 +0100)]
configure: Add detected C library and host compiler to informative output
Michael Niedermayer [Wed, 4 Dec 2013 13:34:05 +0000 (14:34 +0100)]
avformat/utils: move update_wrap_reference() up
simplifies code
also remove extra {}
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Dec 2013 13:29:35 +0000 (14:29 +0100)]
avformat/utils: reorder operations in update_wrap_reference()
prevents a integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Dec 2013 10:35:21 +0000 (11:35 +0100)]
Revert "avcodec/hevc: calculate checksum only if AV_EF_EXPLODE is set"
This reverts commit
758b6d39f685a510f48ff9e4c05fffa859d23c42 .
Requested-by: smarter
"now that http://git.videolan.org/?p=ffmpeg.git;a=commit;h=
97de206b44a48da726807cc3e7b9448a8112760b
has been merged, http://git.videolan.org/?p=ffmpeg.git;a=commit;h=
758b6d39f685a510f48ff9e4c05fffa859d23c42
could be reverted, this would reduce the delta with libav
(and it makes sense)"
Michael Niedermayer [Wed, 4 Dec 2013 03:30:42 +0000 (04:30 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: initialize hwaccel_pix_fmt
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Rainer Hochecker [Tue, 3 Dec 2013 09:03:04 +0000 (10:03 +0100)]
mpegts: do not set pts for missing dts in video streams
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Dec 2013 01:00:23 +0000 (02:00 +0100)]
avformat/utils: correct for timestamp wrap earlier
This uses dts & pts as reference instead of first_dts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Dec 2013 01:15:41 +0000 (02:15 +0100)]
avformat/utils: also fix wrapping of start_time in update_initial_timestamps()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Dec 2013 00:49:14 +0000 (01:49 +0100)]
avformat/utils: Fix pts_wrap_behavior calculation with negative first_dts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Tue, 3 Dec 2013 20:25:36 +0000 (21:25 +0100)]
ffprobe: free shared writer context on exit
Fix leak.
Spotted-by: Michael Niedermayer
Michael Niedermayer [Tue, 3 Dec 2013 18:55:12 +0000 (19:55 +0100)]
libavcodec/mpegaudio: change CONFIG_FLOAT to USE_FLOAT
The CONFIG_ name-space is set by configure, so its better to use a
different prefix here.
This also unifies the encoder & decoder define that is used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 16 Nov 2013 12:15:35 +0000 (13:15 +0100)]
avcodec: split mp2 encoder into float and fixed
This makes the USE_FLOATS == 0 available to the end user
More float optimizations can easily be added as well now
common code should be factored out into a common file once all
fixed point & floating point optimizations are done, this is to
avoid having to move code back and forth between files.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sat, 23 Nov 2013 13:07:48 +0000 (14:07 +0100)]
avconv: initialize hwaccel_pix_fmt
Fixes an assertion failure in vdpau_get_buffer() when -hwaccel auto is
used, but hwaccel init fails.
Ronald S. Bultje [Tue, 3 Dec 2013 12:29:35 +0000 (07:29 -0500)]
vp9_parser: handle zero-sized packets.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Dec 2013 11:20:44 +0000 (12:20 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
alsa-audio-dec: explicitly cast the delay to a signed int64
Conflicts:
libavdevice/alsa-audio-dec.c
no change as the buggy code has been replaced in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sun, 1 Dec 2013 08:27:01 +0000 (09:27 +0100)]
alsa-audio-dec: explicitly cast the delay to a signed int64
Otherwise the expression will be evaluated as unsigned, which will break
when the result should be negative.
CC:libav-stable@libav.org
Michael Niedermayer [Tue, 3 Dec 2013 03:08:37 +0000 (04:08 +0100)]
avfilter/vf_pad: fix req_end
Fixes out of array accesses
Fixes Ticket3190
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Dec 2013 00:23:58 +0000 (01:23 +0100)]
Makefile: add dependancies for ffversion.h
It has to be build before the objects that use it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Dec 2013 23:00:04 +0000 (00:00 +0100)]
doc/examples/filtering_audio: init packet0.data
Fixes use of uinitialized data and crash
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 2 Dec 2013 22:47:30 +0000 (23:47 +0100)]
doc/ffserver: remove spurious NoAudio option from stream example
Stefano Sabatini [Mon, 2 Dec 2013 18:44:09 +0000 (19:44 +0100)]
lavfi/volume: support all channel counts
Michael Niedermayer [Mon, 2 Dec 2013 22:04:05 +0000 (23:04 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dv: Split off DV video encoder into its own file
Conflicts:
libavcodec/dv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Dec 2013 19:24:02 +0000 (20:24 +0100)]
Merge commit '
21710ea82118c9d19bea9277b2a85a33096fdd95 '
* commit '
21710ea82118c9d19bea9277b2a85a33096fdd95 ':
dv: Move DV VLC data tables out of header file
Conflicts:
libavcodec/dv_vlc_data.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Dec 2013 19:17:36 +0000 (20:17 +0100)]
Merge commit '
5a9fcc7d2524d6c0f86b2855019ee9f4cf360276 '
* commit '
5a9fcc7d2524d6c0f86b2855019ee9f4cf360276 ':
build: Add rule for building host-specific object files
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Dec 2013 19:03:24 +0000 (20:03 +0100)]
Merge commit '
ad477710244c761ad1c21246c34e0075fee12d11 '
* commit '
ad477710244c761ad1c21246c34e0075fee12d11 ':
build: Add shorthand for HOSTCC compile macro
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 2 Dec 2013 14:21:52 +0000 (15:21 +0100)]
doc/examples/filtering_audio: fix chunked audio decoding
Support the case when multiple frames are contained in a single packet.
In particular, fix fate-samples/lossless-audio/luckynight-partial.shn
sample decoding.
Stefano Sabatini [Mon, 2 Dec 2013 13:43:40 +0000 (14:43 +0100)]
doc/examples/filtering_audio: fix style
Stefano Sabatini [Mon, 2 Dec 2013 13:31:44 +0000 (14:31 +0100)]
doc/examples/filtering_video: do not make use of AVBufferSinkParams
Set the value on the filter context instead. Simplify.
Stefano Sabatini [Mon, 2 Dec 2013 13:25:45 +0000 (14:25 +0100)]
doc/examples/filtering_video: add some error handling in init_filters()
Stefano Sabatini [Mon, 2 Dec 2013 13:22:11 +0000 (14:22 +0100)]
doc/examples/README: fix typo
Stefano Sabatini [Mon, 2 Dec 2013 12:18:11 +0000 (13:18 +0100)]
doc/examples/filtering_audio: add more error checks
Stefano Sabatini [Mon, 2 Dec 2013 12:08:00 +0000 (13:08 +0100)]
doc/examples/filtering: make use of av_err2str()
Simplify.
Diego Biurrun [Thu, 5 Apr 2012 14:58:43 +0000 (16:58 +0200)]
dv: Split off DV video encoder into its own file
Diego Biurrun [Sun, 10 Nov 2013 16:23:31 +0000 (17:23 +0100)]
dv: Move DV VLC data tables out of header file
Diego Biurrun [Sun, 1 Dec 2013 05:01:51 +0000 (06:01 +0100)]
build: Add rule for building host-specific object files
Diego Biurrun [Mon, 2 Dec 2013 02:51:48 +0000 (03:51 +0100)]
build: Add shorthand for HOSTCC compile macro
Lenny Wang [Sat, 30 Nov 2013 07:27:57 +0000 (01:27 -0600)]
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>
Michael Niedermayer [Mon, 2 Dec 2013 10:11:08 +0000 (11:11 +0100)]
configure: put pthread_create() check back
Unbreaks freebsd, broken since
f058f384a0d76bfd125f4738dceab7c890186432
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Dec 2013 09:59:41 +0000 (10:59 +0100)]
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>
Diego Biurrun [Sun, 1 Dec 2013 04:05:23 +0000 (05:05 +0100)]
dsputil: x86: Move ff_inv_zigzag_direct16 table init to mpegvideo
The table is MMX-specific and used nowhere else.
Michael Niedermayer [Mon, 2 Dec 2013 01:36:58 +0000 (02:36 +0100)]
avcodec/h264_refs: improve key frame detection heuristic
Fixes Ticket3186
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Dec 2013 01:12:39 +0000 (02:12 +0100)]
avcodec/h264_refs: split conditions of if() up for better readability
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Dec 2013 21:12:57 +0000 (22:12 +0100)]
avformat/avisynth: remove duplicate av_new_packet() call
Found-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Dec 2013 20:50:13 +0000 (21:50 +0100)]
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>
Michael Niedermayer [Sun, 1 Dec 2013 20:17:55 +0000 (21:17 +0100)]
Merge commit '
3cd612d44789948f72b52944474e0870c5c60964 '
* commit '
3cd612d44789948f72b52944474e0870c5c60964 ':
gitignore: Ignore multilibrary example programs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Dec 2013 16:42:07 +0000 (17:42 +0100)]
Revert "vf_yadif: move x86 init code to x86/yadif.c"
This reverts commit
a87b17f3283aada762820f1b797eeb7a2dff6c61 .
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>
Michael Niedermayer [Sun, 1 Dec 2013 15:37:18 +0000 (16:37 +0100)]
Revert "yadif: add parens around macro parameters"
This reverts commit
49e617f9565b6528fe707bae7ea4b62b10c771a5 .
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>
Michael Niedermayer [Sun, 1 Dec 2013 15:26:17 +0000 (16:26 +0100)]
avfilter/yadif: Revert "lavfi: convert input/ouput list compound literals to named objects"
This reverts commit
568c70e79ee267426c15ef4603c69703f6a5884a .
This reduces the amount of non LGPL code, making a relicensing to LGPL
easier
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 1 Dec 2013 00:19:26 +0000 (01:19 +0100)]
doc/ffserver: fix misc minor typos
Diego Biurrun [Fri, 29 Nov 2013 18:24:56 +0000 (13:24 -0500)]
doc: Try to find nonstandard Perl path from the environment
Anton Khirnov [Sun, 1 Dec 2013 11:03:35 +0000 (06:03 -0500)]
avisynth: make avs_library statically allocated.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stephen Hutchinson [Sun, 1 Dec 2013 11:03:34 +0000 (06:03 -0500)]
avisynth: Move to av_new_packet/av_free_packet.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>