ffmpeg.git
6 years agolavfi: add haldclutsrc filter.
Clément Bœsch [Thu, 23 May 2013 08:13:35 +0000 (10:13 +0200)]
lavfi: add haldclutsrc filter.

6 years agoj2k_dwt: fix scaling of 9/7 dwt
Michael Niedermayer [Mon, 27 May 2013 17:57:42 +0000 (19:57 +0200)]
j2k_dwt: fix scaling of 9/7 dwt

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2kenc: Allow encoding with the 9/7 wavelet
Michael Niedermayer [Mon, 27 May 2013 16:50:18 +0000 (18:50 +0200)]
j2kenc: Allow encoding with the 9/7 wavelet

Also add a fate test that tests 9/7

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k: change fixed point of stepsize to 16.16
Michael Niedermayer [Mon, 27 May 2013 15:58:06 +0000 (17:58 +0200)]
j2k: change fixed point of stepsize to 16.16

This seems more natural and matches jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k/jpeg2000: Partially merge quantization code
Michael Niedermayer [Mon, 27 May 2013 15:46:54 +0000 (17:46 +0200)]
j2k/jpeg2000: Partially merge quantization code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k/jpeg2000: merge a few whitespaces
Michael Niedermayer [Mon, 27 May 2013 14:10:36 +0000 (16:10 +0200)]
j2k/jpeg2000: merge a few whitespaces

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k: drop cblknx/y from Jpeg2000Band
Michael Niedermayer [Mon, 27 May 2013 13:55:29 +0000 (15:55 +0200)]
j2k: drop cblknx/y from Jpeg2000Band

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k/jpeg2000: drop xi/yi0/1 from Jpeg2000Prec
Michael Niedermayer [Mon, 27 May 2013 13:53:42 +0000 (15:53 +0200)]
j2k/jpeg2000: drop xi/yi0/1 from  Jpeg2000Prec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k: remove cblk from band
Michael Niedermayer [Mon, 27 May 2013 12:55:46 +0000 (14:55 +0200)]
j2k: remove cblk from band

cblk is now in the same place as in jpeg2000, which will simplify
merging the 2 decoders

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2kdec: merge decode_tile cblk handling from jpeg2000
Michael Niedermayer [Mon, 27 May 2013 12:51:30 +0000 (14:51 +0200)]
j2kdec: merge decode_tile cblk handling from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2kdec: cdxy != 1 does not work, print an error
Michael Niedermayer [Mon, 27 May 2013 12:50:04 +0000 (14:50 +0200)]
j2kdec: cdxy != 1 does not work, print an error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k/jpeg2000: restructure cblk coord
Michael Niedermayer [Mon, 27 May 2013 12:30:42 +0000 (14:30 +0200)]
j2k/jpeg2000: restructure cblk coord

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k: fix band coord
Michael Niedermayer [Mon, 27 May 2013 12:31:05 +0000 (14:31 +0200)]
j2k: fix band coord

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2kdec: merge cblk restructuring from jpeg2000
Michael Niedermayer [Mon, 27 May 2013 08:05:21 +0000 (10:05 +0200)]
j2kdec: merge cblk restructuring from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2kenc: switch to cblk in prec
Michael Niedermayer [Mon, 27 May 2013 00:18:43 +0000 (02:18 +0200)]
j2kenc: switch to cblk in prec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k: merge precinct init code from jpeg2000
Michael Niedermayer [Sun, 26 May 2013 22:16:07 +0000 (00:16 +0200)]
j2k: merge precinct init code from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k/jpeg2000 headers: Cblk/Prec cleanup & merge
Michael Niedermayer [Sun, 26 May 2013 21:55:18 +0000 (23:55 +0200)]
j2k/jpeg2000 headers: Cblk/Prec cleanup & merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/ocv: make use of AVFILTER_DEFINE_CLASS
Paul B Mahol [Mon, 27 May 2013 11:28:17 +0000 (11:28 +0000)]
lavfi/ocv: make use of AVFILTER_DEFINE_CLASS

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/frei0r: make use of AVFILTER_DEFINE_CLASS
Paul B Mahol [Mon, 27 May 2013 11:19:49 +0000 (11:19 +0000)]
lavfi/frei0r: make use of AVFILTER_DEFINE_CLASS

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/channelmap: make use of AVFILTER_DEFINE_CLASS
Paul B Mahol [Mon, 27 May 2013 11:30:31 +0000 (11:30 +0000)]
lavfi/channelmap: make use of AVFILTER_DEFINE_CLASS

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/format: make use of AVFILTER_DEFINE_CLASS
Paul B Mahol [Mon, 27 May 2013 11:17:34 +0000 (11:17 +0000)]
lavfi/format: make use of AVFILTER_DEFINE_CLASS

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/setpts: make use of AVFILTER_DEFINE_CLASS
Paul B Mahol [Mon, 27 May 2013 11:14:43 +0000 (11:14 +0000)]
lavfi/setpts: make use of AVFILTER_DEFINE_CLASS

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/join: make use of AVFILTER_DEFINE_CLASS
Paul B Mahol [Mon, 27 May 2013 11:10:39 +0000 (11:10 +0000)]
lavfi/join: make use of AVFILTER_DEFINE_CLASS

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/hqdn3d: make use of AVFILTER_DEFINE_CLASS
Paul B Mahol [Mon, 27 May 2013 10:58:45 +0000 (10:58 +0000)]
lavfi/hqdn3d: make use of AVFILTER_DEFINE_CLASS

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/interlace: make use of AVFILTER_DEFINE_CLASS
Paul B Mahol [Mon, 27 May 2013 09:57:30 +0000 (09:57 +0000)]
lavfi/interlace: make use of AVFILTER_DEFINE_CLASS

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/trim: make use of AVFILTER_DEFINE_CLASS
Paul B Mahol [Sun, 26 May 2013 19:31:35 +0000 (19:31 +0000)]
lavfi/trim: make use of AVFILTER_DEFINE_CLASS

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/interlace: remove request frame hack
Paul B Mahol [Sun, 26 May 2013 19:17:55 +0000 (19:17 +0000)]
lavfi/interlace: remove request frame hack

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/trim: remove request frame hack
Paul B Mahol [Sun, 26 May 2013 19:13:41 +0000 (19:13 +0000)]
lavfi/trim: remove request frame hack

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/tinterlace: remove request frame hack
Paul B Mahol [Sun, 26 May 2013 19:03:18 +0000 (19:03 +0000)]
lavfi/tinterlace: remove request frame hack

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/idet: remove request_frame hack
Paul B Mahol [Sun, 26 May 2013 18:52:11 +0000 (18:52 +0000)]
lavfi/idet: remove request_frame hack

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'dilaroga/master'
Michael Niedermayer [Mon, 27 May 2013 07:31:51 +0000 (09:31 +0200)]
Merge remote-tracking branch 'dilaroga/master'

* dilaroga/master:
  avcodec/vda_h264_dec: fix a memory leak
  avcodec/vda_h264: use av_buffer to manage buffers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vda_h264_dec: fix a memory leak
Xidorn Quan [Tue, 21 May 2013 04:12:31 +0000 (12:12 +0800)]
avcodec/vda_h264_dec: fix a memory leak

Signed-off-by: Sebastien Zwickert <dilaroga@gmail.com>
6 years agoavcodec/vda_h264: use av_buffer to manage buffers
Xidorn Quan [Tue, 21 May 2013 04:12:30 +0000 (12:12 +0800)]
avcodec/vda_h264: use av_buffer to manage buffers

This patch fixes a leak of buffer when seeking occurs.
It adds a flag in struct vda_context for compatibility with apps which
currently use it. If the flag is not set, the hwaccel will behave like
before.

Signed-off-by: Sebastien Zwickert <dilaroga@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 27 May 2013 06:55:20 +0000 (08:55 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: Only output eabi attributes if building for ELF
  fix scalarproduct_and_madd_int16_altivec() for orders > 16

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k: merge cosmetics and non functional changes from jpeg2000
Michael Niedermayer [Sun, 26 May 2013 20:40:25 +0000 (22:40 +0200)]
j2k: merge cosmetics and non functional changes from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibtwolame: add forgotten calls
Paul B Mahol [Sun, 26 May 2013 21:57:28 +0000 (21:57 +0000)]
libtwolame: add forgotten calls

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoarm: Only output eabi attributes if building for ELF
Martin Storsjö [Sun, 26 May 2013 09:47:33 +0000 (12:47 +0300)]
arm: Only output eabi attributes if building for ELF

This matches the other eabi attribute in the same file. This is
required in order to build for arm/hardfloat with other object
file formats than ELF.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavfi/dctdnoiz: move DC normalization out of loops.
Clément Bœsch [Sun, 26 May 2013 20:32:24 +0000 (22:32 +0200)]
lavfi/dctdnoiz: move DC normalization out of loops.

Make code slightly faster, simpler, clearer.

The filter is still slow as hell, and that change won't cause any
visible performance improvement (it still takes more than one minute to
process a single 1080p frame on a Core 2 here).

6 years agoj2k/jpeg2000: log2_prec size cleanup
Michael Niedermayer [Sun, 26 May 2013 19:50:17 +0000 (21:50 +0200)]
j2k/jpeg2000: log2_prec size cleanup

This also changes the cblk size storage method to what jpeg2000 uses

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k/jpeg2000: check cblk size
Michael Niedermayer [Sun, 26 May 2013 18:05:30 +0000 (20:05 +0200)]
j2k/jpeg2000: check cblk size

This is based on j2k FCD which is ambigous thus the limit
might be tighter.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k: ff_j2k_tag_tree_init: check for integer overflow in alloc
Michael Niedermayer [Sun, 26 May 2013 17:18:58 +0000 (19:18 +0200)]
j2k: ff_j2k_tag_tree_init: check for integer overflow in alloc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000: cosmetics & restructuring from jpeg2000
Michael Niedermayer [Sun, 26 May 2013 17:18:31 +0000 (19:18 +0200)]
jpeg2000: cosmetics & restructuring from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k: add #includes from jpeg2000
Michael Niedermayer [Sun, 26 May 2013 17:09:05 +0000 (19:09 +0200)]
j2k: add #includes from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k: cosmetics from jpeg2000
Michael Niedermayer [Sun, 26 May 2013 17:00:56 +0000 (19:00 +0200)]
j2k: cosmetics from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2kdec: add AVClass
Michael Niedermayer [Sun, 26 May 2013 16:52:47 +0000 (18:52 +0200)]
j2kdec: add AVClass

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2kdec: cosmetics from jpeg2000
Michael Niedermayer [Sun, 26 May 2013 16:52:31 +0000 (18:52 +0200)]
j2kdec: cosmetics from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2kdec: merge copyright header with jpeg2000
Michael Niedermayer [Sun, 26 May 2013 16:50:18 +0000 (18:50 +0200)]
j2kdec: merge copyright header with jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2kdec: profile code from jpeg2000
Michael Niedermayer [Sun, 26 May 2013 16:47:53 +0000 (18:47 +0200)]
j2kdec: profile code from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2kdec: cosmetics from jpeg2000
Michael Niedermayer [Sun, 26 May 2013 16:47:25 +0000 (18:47 +0200)]
j2kdec: cosmetics from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/j2kdec: drop disabled debug code
Michael Niedermayer [Sun, 26 May 2013 16:42:00 +0000 (18:42 +0200)]
avcodec/j2kdec: drop disabled debug code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k/jpeg2000: merge cosmetics and whitespace
Michael Niedermayer [Sun, 26 May 2013 16:32:11 +0000 (18:32 +0200)]
j2k/jpeg2000: merge cosmetics and whitespace

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2kdec: merge jpeg2000_init_static_data() from jpeg2000
Michael Niedermayer [Sun, 26 May 2013 16:27:53 +0000 (18:27 +0200)]
j2kdec: merge jpeg2000_init_static_data() from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2kdec: move avctx init to decode_frame
Michael Niedermayer [Sun, 26 May 2013 16:26:07 +0000 (18:26 +0200)]
j2kdec: move avctx init to decode_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/lut3d: faster tetrahedral interpolation.
Clément Bœsch [Sun, 26 May 2013 16:45:39 +0000 (18:45 +0200)]
lavfi/lut3d: faster tetrahedral interpolation.

Increase performance by fetching only the necessary points.

1097 → 917 decicyles.

6 years agolavfi/lut3d: restore original interpolation speed.
Clément Bœsch [Sun, 26 May 2013 16:36:53 +0000 (18:36 +0200)]
lavfi/lut3d: restore original interpolation speed.

Call NEXT() only once since it got slower due to the overflow condition
introduced in 91b46145.

interp_trilinear:   1462 → 1280 decicycles
interp_tetrahedral: 1188 → 1097 decicycles

Tested on a Core2, GCC 4.8.

6 years agoj2k: s/ff_j2k_getsigctxno/ff_jpeg2000_getsigctxno/g
Michael Niedermayer [Sun, 26 May 2013 16:02:38 +0000 (18:02 +0200)]
j2k: s/ff_j2k_getsigctxno/ff_jpeg2000_getsigctxno/g

Also add a related comment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k.h: whitespace cosmetics
Michael Niedermayer [Sun, 26 May 2013 16:01:23 +0000 (18:01 +0200)]
j2k.h: whitespace cosmetics

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k.h: remove disabled debug code
Michael Niedermayer [Sun, 26 May 2013 15:58:44 +0000 (17:58 +0200)]
j2k.h: remove disabled debug code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k.h: Merges various cosmetics & unused defines
Michael Niedermayer [Sun, 26 May 2013 15:58:12 +0000 (17:58 +0200)]
j2k.h: Merges various cosmetics & unused defines

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k/jpeg2000: merge copyright
Michael Niedermayer [Sun, 26 May 2013 15:45:15 +0000 (17:45 +0200)]
j2k/jpeg2000: merge copyright

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k: drop disabled debug code
Michael Niedermayer [Sun, 26 May 2013 15:43:53 +0000 (17:43 +0200)]
j2k: drop disabled debug code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k: merge ff_j2k_init_tier1_luts()
Michael Niedermayer [Sun, 26 May 2013 15:42:25 +0000 (17:42 +0200)]
j2k: merge ff_j2k_init_tier1_luts()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000/j2k: merge getsigctxno()
Michael Niedermayer [Sun, 26 May 2013 15:39:02 +0000 (17:39 +0200)]
jpeg2000/j2k: merge getsigctxno()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k: s/getnbctxno/getsigctxno/g
Michael Niedermayer [Sun, 26 May 2013 15:33:08 +0000 (17:33 +0200)]
j2k: s/getnbctxno/getsigctxno/g

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k: redesign vert_causal_ctx_csty implementation
Michael Niedermayer [Sun, 26 May 2013 14:33:59 +0000 (16:33 +0200)]
j2k: redesign vert_causal_ctx_csty implementation

The old implementation was incomplete and could not have worked
This also fixes some warnings
New code is untested as i dont seem to have a sample file that uses this.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofix scalarproduct_and_madd_int16_altivec() for orders > 16
Kostya Shishkov [Fri, 24 May 2013 17:44:29 +0000 (19:44 +0200)]
fix scalarproduct_and_madd_int16_altivec() for orders > 16

the second and third sources were incremented only by half of the needed size

6 years agolavfi/bbox: export bbox info to frame metadata
Paul B Mahol [Sun, 26 May 2013 09:53:03 +0000 (09:53 +0000)]
lavfi/bbox: export bbox info to frame metadata

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/bbox: timeline support
Paul B Mahol [Sun, 26 May 2013 09:23:39 +0000 (09:23 +0000)]
lavfi/bbox: timeline support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/bbox: make min_val user configurable
Paul B Mahol [Sun, 26 May 2013 09:22:02 +0000 (09:22 +0000)]
lavfi/bbox: make min_val user configurable

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/bbox: use inlink->frame_count
Paul B Mahol [Sun, 26 May 2013 09:12:36 +0000 (09:12 +0000)]
lavfi/bbox: use inlink->frame_count

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavf/swf: remove unused assert include.
Clément Bœsch [Sun, 26 May 2013 13:48:12 +0000 (15:48 +0200)]
lavf/swf: remove unused assert include.

6 years agoj2kdec: fix used bytestream function
Michael Niedermayer [Sun, 26 May 2013 12:53:23 +0000 (14:53 +0200)]
j2kdec: fix used bytestream function

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k: rename a few inline functions and data tables to match jpeg2000
Michael Niedermayer [Sun, 26 May 2013 11:54:32 +0000 (13:54 +0200)]
j2k: rename a few inline functions and data tables to match jpeg2000

also inlcudes some other cosmetics

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2kdec: prog_order reading from jpeg2000dec
Michael Niedermayer [Sun, 26 May 2013 11:33:10 +0000 (13:33 +0200)]
j2kdec: prog_order reading from jpeg2000dec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k: merge Jpeg2000CodingStyle from jpeg2000
Michael Niedermayer [Sun, 26 May 2013 11:29:49 +0000 (13:29 +0200)]
j2k: merge Jpeg2000CodingStyle from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroska_read_seek: Fix used streams for subtitle index compensation
Michael Niedermayer [Mon, 20 May 2013 02:00:30 +0000 (04:00 +0200)]
matroska_read_seek: Fix used streams for subtitle index compensation

Might fix Ticket1907 (I have no testcase so i cant test)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/noise: use av_image_copy_plane()
Paul B Mahol [Sun, 26 May 2013 10:52:57 +0000 (10:52 +0000)]
lavfi/noise: use av_image_copy_plane()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoav_cpu_count: factorize "detected %d logical cores" message
Michael Niedermayer [Sun, 26 May 2013 00:18:38 +0000 (02:18 +0200)]
av_cpu_count: factorize "detected %d logical cores" message

Also print the message just once

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoav_d2q: Avoid llrint(), its not correctly implemented in old netbsd
Michael Niedermayer [Sun, 26 May 2013 01:18:17 +0000 (03:18 +0200)]
av_d2q: Avoid llrint(), its not correctly implemented in old netbsd

This should fix some fate failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/encoders: Add documentation for libmp3lame
Timothy Gu [Fri, 24 May 2013 19:28:48 +0000 (12:28 -0700)]
doc/encoders: Add documentation for libmp3lame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 25 May 2013 19:42:56 +0000 (21:42 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  msvc/icl: Intel Compiler support on Windows

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9495cd170b5786c3518419e873d94eb5e7ada11a'
Michael Niedermayer [Sat, 25 May 2013 19:36:48 +0000 (21:36 +0200)]
Merge commit '9495cd170b5786c3518419e873d94eb5e7ada11a'

* commit '9495cd170b5786c3518419e873d94eb5e7ada11a':
  configure: Fix check_exec_crash for ICL support

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo_enc: do not unreference frames before the code is done with them
Michael Niedermayer [Sat, 25 May 2013 18:29:17 +0000 (20:29 +0200)]
mpegvideo_enc: do not unreference frames before the code is done with them

Fixes Ticket2592

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mov: Rename alt_sample_size so its name matches what it is
Michael Niedermayer [Sat, 25 May 2013 16:38:49 +0000 (18:38 +0200)]
avformat/mov: Rename alt_sample_size so its name matches what it is

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomsvc/icl: Intel Compiler support on Windows
Alex Smith [Sat, 25 May 2013 10:07:42 +0000 (06:07 -0400)]
msvc/icl: Intel Compiler support on Windows

Initial support for the ICL compiler on windows. Requires a new
c99wrap with ICL support (1.0.2+).

Currently not much different speed wise compared to msvc. In the
future with a few changes it can be made to support the inline asm.
This would be the primary reason for using it.

Passed all fate tests, versions tested:
    13.1.1.171 (2013 Update 3) x86 and x64
    12.1.5.344 (2011 Update 11) x86 and x64

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoavutil/md5: reindent after previous commits
Giorgio Vazzana [Tue, 21 May 2013 08:36:20 +0000 (10:36 +0200)]
avutil/md5: reindent after previous commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoav_d2q: fix rounding for negative values
Michael Niedermayer [Sat, 25 May 2013 13:38:07 +0000 (15:38 +0200)]
av_d2q: fix rounding for negative values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoav_d2q: Fix infinity check
Michael Niedermayer [Sat, 25 May 2013 13:22:19 +0000 (15:22 +0200)]
av_d2q: Fix infinity check

The old check would fail on huge but not infinite values
and the later code could then fail to handle them correctly in
some cases.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/afade: add timeline support
Paul B Mahol [Sat, 25 May 2013 13:08:13 +0000 (13:08 +0000)]
lavfi/afade: add timeline support

For correct precision one may need to use asetnsamples.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoconfigure: Fix check_exec_crash for ICL support
Laurent [Sat, 25 May 2013 10:01:29 +0000 (06:01 -0400)]
configure: Fix check_exec_crash for ICL support

Change the check_exec_crash test to use a function pointer instead of
simply calling the function. The EBP availability test will crash when
compiled with ICL likely due to compiler optimization shenanigans.

Originally the check_exec_crash code was moved out of main to fix a
problem with gcc's treatment of non-leaf main on x86_32. Libav already
moved the code out of main but the addition of the function pointer will
prevent any inlining which fixes the remaining problem.

A function pointer is used since it is compiler agnostic (as opposed to
say __attribute__ ((noinline)) which would only work with gcc compatible
compilers).

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoimg2dec: support seeking with ts_from_file
Michael Niedermayer [Sat, 25 May 2013 10:06:14 +0000 (12:06 +0200)]
img2dec: support seeking with ts_from_file

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoimg2dec: dont set start_time/duration to invalid values
Michael Niedermayer [Sat, 25 May 2013 10:05:32 +0000 (12:05 +0200)]
img2dec: dont set start_time/duration to invalid values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoimg2dec: Add ts_from_file option
Andrey Utkin [Fri, 24 May 2013 13:50:36 +0000 (16:50 +0300)]
img2dec: Add ts_from_file option

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/blend: support slice threading
Paul B Mahol [Fri, 24 May 2013 18:14:54 +0000 (18:14 +0000)]
lavfi/blend: support slice threading

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agovf_fade: remove unused function
Michael Niedermayer [Fri, 24 May 2013 18:50:15 +0000 (20:50 +0200)]
vf_fade: remove unused function

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: remove ff_get_logical_cpus()
Michael Niedermayer [Fri, 24 May 2013 18:24:29 +0000 (20:24 +0200)]
avcodec: remove ff_get_logical_cpus()

This simplifies the code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_fade: Support slice threaded alpha
Michael Niedermayer [Fri, 24 May 2013 18:02:34 +0000 (20:02 +0200)]
vf_fade: Support slice threaded alpha

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_fade: Fix alpha flag integration
Michael Niedermayer [Fri, 24 May 2013 17:55:33 +0000 (19:55 +0200)]
vf_fade: Fix alpha flag integration

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/blend: fix SW/SH calculation
Paul B Mahol [Fri, 24 May 2013 17:34:22 +0000 (17:34 +0000)]
lavfi/blend: fix SW/SH calculation

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agofade: fix slice sizes
Michael Niedermayer [Fri, 24 May 2013 15:34:36 +0000 (17:34 +0200)]
fade: fix slice sizes

This more evenly distributes the load between threads

This also fixes the chroma filtering where the filter was applied twice

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>