Michael Niedermayer
97f7586cd6
Merge commit '5f30c6c8ed1f006c1b3a547dfe388f3a4a080e4d'
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 07:49:38 +02:00
Michael Niedermayer
9c66da517f
j2kenc: Zero DWT struct on allocation
...
Should fix fate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 02:47:25 +02:00
Michael Niedermayer
05fa3f6802
j2kdec: random non functional changed from jpeg2000
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 01:46:59 +02:00
Michael Niedermayer
d66de3801e
j2kdec: merge get_tlm() from jpeg2000
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 01:11:30 +02:00
Michael Niedermayer
8cf57efdd7
j2k/jpeg2000: merge lowres code
...
This also fixes lowres use with ffplay
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 00:30:06 +02:00
Michael Niedermayer
840ee5e1a1
ffplay: dont forget passing lowres to private options
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 00:09:34 +02:00
Michael Niedermayer
f82e7330af
jpeg2000: merge mant type from j2k
...
mant fits in 16bit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27 22:25:03 +02:00
Michael Niedermayer
d4a4661342
j2k/jpeg2000: merge j2k & jpeg2000 dwts, drop j2k dwt
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27 21:54:07 +02:00
Clément Bœsch
160ea26560
lavfi/haldclutsrc: 10l remove size options.
2013-05-27 20:53:25 +02:00
Clément Bœsch
92a2d12a71
lavfi/overlay: remove do_blend forward declaration.
2013-05-27 20:42:46 +02:00
Clément Bœsch
ae5738248a
lavfi/lut3d: move lut3d init to its definition scope.
2013-05-27 20:42:46 +02:00
Clément Bœsch
158d96e3f0
lavfi: add haldclut filter.
...
Fixes Ticket #2517 .
2013-05-27 20:42:28 +02:00
Clément Bœsch
4328602890
lavfi: add dual input helpers.
2013-05-27 20:32:28 +02:00
Clément Bœsch
3cec29cf59
lavfi: add haldclutsrc filter.
2013-05-27 20:32:28 +02:00
Michael Niedermayer
1bbb46ff71
j2k_dwt: fix scaling of 9/7 dwt
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27 19:57:42 +02:00
Michael Niedermayer
ee189701a6
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>
2013-05-27 18:50:18 +02:00
Kostya Shishkov
5f30c6c8ed
Revert "smackaud: clip output samples"
...
Smacker audio uses overflows instead of clipping.
This reverts commit 375ca0aca8
.
2013-05-27 18:19:01 +02:00
Michael Niedermayer
243cc38d94
j2k: change fixed point of stepsize to 16.16
...
This seems more natural and matches jpeg2000
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27 17:58:06 +02:00
Michael Niedermayer
1b5cb6c00a
j2k/jpeg2000: Partially merge quantization code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27 17:50:54 +02:00
Michael Niedermayer
9a18395b92
j2k/jpeg2000: merge a few whitespaces
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27 16:10:36 +02:00
Michael Niedermayer
c2e942099a
j2k: drop cblknx/y from Jpeg2000Band
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27 15:55:29 +02:00
Michael Niedermayer
8c2e201c4f
j2k/jpeg2000: drop xi/yi0/1 from Jpeg2000Prec
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27 15:53:42 +02:00
Michael Niedermayer
a05db52c12
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>
2013-05-27 15:13:51 +02:00
Michael Niedermayer
81ccc31f75
j2kdec: merge decode_tile cblk handling from jpeg2000
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27 15:13:18 +02:00
Michael Niedermayer
2c5a5c5a62
j2kdec: cdxy != 1 does not work, print an error
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27 15:13:18 +02:00
Michael Niedermayer
14652c080d
j2k/jpeg2000: restructure cblk coord
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27 15:13:18 +02:00
Michael Niedermayer
5161c62595
j2k: fix band coord
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27 15:13:18 +02:00
Michael Niedermayer
369422db0c
j2kdec: merge cblk restructuring from jpeg2000
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27 15:13:18 +02:00
Michael Niedermayer
cbaa0871c2
j2kenc: switch to cblk in prec
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27 15:13:18 +02:00
Michael Niedermayer
9fd23baa74
j2k: merge precinct init code from jpeg2000
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27 15:13:18 +02:00
Michael Niedermayer
3300b5f6ce
j2k/jpeg2000 headers: Cblk/Prec cleanup & merge
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27 15:13:18 +02:00
Paul B Mahol
a1873f35f8
lavfi/ocv: make use of AVFILTER_DEFINE_CLASS
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 11:31:52 +00:00
Paul B Mahol
229d5bfdc8
lavfi/frei0r: make use of AVFILTER_DEFINE_CLASS
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 11:31:52 +00:00
Paul B Mahol
beda41886e
lavfi/channelmap: make use of AVFILTER_DEFINE_CLASS
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 11:31:52 +00:00
Paul B Mahol
6008b5abbb
lavfi/format: make use of AVFILTER_DEFINE_CLASS
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 11:17:34 +00:00
Paul B Mahol
e457f2cf1f
lavfi/setpts: make use of AVFILTER_DEFINE_CLASS
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 11:14:43 +00:00
Paul B Mahol
5fe5bde60a
lavfi/join: make use of AVFILTER_DEFINE_CLASS
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 11:10:39 +00:00
Paul B Mahol
622c977437
lavfi/hqdn3d: make use of AVFILTER_DEFINE_CLASS
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 10:58:45 +00:00
Paul B Mahol
d349704eef
lavfi/interlace: make use of AVFILTER_DEFINE_CLASS
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 10:00:37 +00:00
Paul B Mahol
11cdf9671f
lavfi/trim: make use of AVFILTER_DEFINE_CLASS
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 09:55:40 +00:00
Paul B Mahol
68def27124
lavfi/interlace: remove request frame hack
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 09:55:40 +00:00
Paul B Mahol
ed1c83508e
lavfi/trim: remove request frame hack
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 09:55:40 +00:00
Paul B Mahol
4f8e4b8a54
lavfi/tinterlace: remove request frame hack
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 09:55:40 +00:00
Paul B Mahol
c63e4e6569
lavfi/idet: remove request_frame hack
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 09:55:39 +00:00
Michael Niedermayer
1c711b6ecd
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>
2013-05-27 09:32:22 +02:00
Xidorn Quan
499b82f604
avcodec/vda_h264_dec: fix a memory leak
...
Signed-off-by: Sebastien Zwickert <dilaroga@gmail.com>
2013-05-27 09:07:48 +02:00
Xidorn Quan
ffd7fd7944
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>
2013-05-27 09:05:55 +02:00
Michael Niedermayer
b7c6d1ed90
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>
2013-05-27 08:55:24 +02:00
Michael Niedermayer
53ec1c811e
j2k: merge cosmetics and non functional changes from jpeg2000
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27 02:27:56 +02:00
Paul B Mahol
e5c7bafb44
libtwolame: add forgotten calls
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-26 21:57:28 +00:00