j2kdec:merge mct_decode from jpeg2000

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

jpeg2000dec: mct_decode: remove unused return

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

ffmpeg: use actual packet pts when discarding for the copypriorss option

The ist->pts value at this point does not necessarily match the actual packet
pts, which is what should be used to decide whether to discard the packet.
Without this change, some video packets that have pts on or after the start
time are getting discarded when they should not be.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

j2k/jpeg2000: split stepsize in float & int variables

This is more clear and less prone to mistakes.

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

jpeg2000dec: remove unneeded returns

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

j2k/jpeg2000: fix typo in lut_gain index

no testcase

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

lavfi/drawutils: attempt to fix subsampling.

j2kdec/jpeg2000dec: partially merge quantization code

The quantization code needs more work, not so much work
merging but more work investigating what is correct.

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

j2kdec: Try to fix 8bps output case

Ive no test samples for which this makes a difference but it
matches the 16bit implementation.

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

tta: make probing more robust

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avcodec/vp8: Cosmetics, maintain alphabetical order in threading headers

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

os2threads: move from lavc to compat/

For useage in other places besides lavc. Needed after commit
90f9a5830b5d332de7ebb1ab45589f1870cbd65d

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

lavf/wvenc: remove hacks since wavpack demuxer & decoder hacks have been fixed

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  smacker: assign video frame PTS
  matroskadec: export full wavpack blocks.

Conflicts:
libavcodec/wavpack.c

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

Merge commit '5074f4545c439420daebe4c2f28ed216440b6ec7'

* commit '5074f4545c439420daebe4c2f28ed216440b6ec7':
  wavpack demuxer: export full wavpack blocks.

Conflicts:
libavformat/wv.c

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

Merge commit '72dee5f40b236c5eb9e68df39df80c68392269e3'

* commit '72dee5f40b236c5eb9e68df39df80c68392269e3':
  wavpack: don't set sample format in init.

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

Merge commit '35596bd4f4d3c39eed838cf3a2613817d62dda99'

* commit '35596bd4f4d3c39eed838cf3a2613817d62dda99':
  wavpack: remove a useless parameter from wavpack_decode_block().

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

Merge commit 'd1bec4be2207738669874e02605e879ea9620974'

* commit 'd1bec4be2207738669874e02605e879ea9620974':
  wavpack: return an error on 0-sized blocks

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

Merge commit '1d177200ce1ffd8902729e3a4d647b04fc4b35f8'

* commit '1d177200ce1ffd8902729e3a4d647b04fc4b35f8':
  wavpack: remove a useless check.

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

Merge commit '0f3a0b24dd6f595feaa4526e52ffa7d05c3d7840'

* commit '0f3a0b24dd6f595feaa4526e52ffa7d05c3d7840':
  wavpack: add an error message to a failure.
  wavpack: return 0 instead of samples count from decoding functions

Conflicts:
libavcodec/wavpack.c

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

wavpack: Properly check channel index, dont write out of arrays

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

Merge commit '528daa399018af74d52192eb1861d2b59d256111'

* commit '528daa399018af74d52192eb1861d2b59d256111':
  wavpack: switch to planar output

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

configure: Fix jack auto-detection, broken since 3fc8500

Merge commit 'a7ec3a9a4eea4e374afcd6e05828b103e6fcb601'

* commit 'a7ec3a9a4eea4e374afcd6e05828b103e6fcb601':
  wavpack: drop redundant if/else blocks

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

Merge commit '7b44c9918086c6aeacf7ef9f902af38b97f43170'

* commit '7b44c9918086c6aeacf7ef9f902af38b97f43170':
  wavpack: remove the subframes codec cap

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

Merge commit 'c330eba84cf2370ad72423aa9e410e20afdc52e2'

* commit 'c330eba84cf2370ad72423aa9e410e20afdc52e2':
  lavf: preserve side data when parsing packets.

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

jpeg2000dwt: add float based 9/7 dwt

Untested as theres no code yet using it in the encoder.
Code based on mixed float/int dwt

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

jpeg2000dwt: remove floats from mixed float/int 9/7 dwt

This should fix some fate failures

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

smacker: assign video frame PTS

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  smacker: add a clarification notice about audio decoding
  configure: make jack depend on pthreads

Conflicts:
configure

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

Merge commit '538bf767373f176b6487e30181155e74b37cced6'

* commit '538bf767373f176b6487e30181155e74b37cced6':
  avconv: make -aspect work with streamcopy

Conflicts:
ffmpeg.c
ffmpeg_opt.c

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

matroskadec: export full wavpack blocks.

This allows us to get rid of demuxer-specific hacks in the decoder and
will allow streamcopy from matroska once we have a wavpack muxer.

wavpack demuxer: export full wavpack blocks.

Currently the demuxer shaves the blocks and exports only the
information that is useful to the decoder.

Exporting the blocks just as they are stored is simpler to understand
and will make remuxing wavpack easier.

wavpack: don't set sample format in init.

We don't know whether it will be float until we look at the data.

Merge commit '564b7e0c0095768cd20001b28154d69462be54e7'

* commit '564b7e0c0095768cd20001b28154d69462be54e7':
  matroskadec: silently skip CodecState element.
  smacker: fix off-by-one error in palette expanding code

Conflicts:
libavformat/smacker.c

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

wavpack: remove a useless parameter from wavpack_decode_block().

The decoder always returns output if an error does not occur.

wavpack: return an error on 0-sized blocks

Such blocks are not valid.

wavpack: remove a useless check.

Number of samples in the first block is checked to be strictly positive
earlier in wavpack_decode_frame() and number of samples in all the other
blocks is checked to be equal to the first one.

wavpack: add an error message to a failure.

wavpack: return 0 instead of samples count from decoding functions

The caller never cares about the number of decoded samples, so this only
confuses the reader.

wavpack: switch to planar output

This simplifies the code and makes it faster.

wavpack: drop redundant if/else blocks

wavpack: remove the subframes codec cap

The decoder always consumes full packets.

lavf: preserve side data when parsing packets.

Merge commit '5f30c6c8ed1f006c1b3a547dfe388f3a4a080e4d'

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

smacker: add a clarification notice about audio decoding

j2kenc: Zero DWT struct on allocation

Should fix fate

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

j2kdec: random non functional changed from jpeg2000

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

j2kdec: merge get_tlm() from jpeg2000

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

j2k/jpeg2000: merge lowres code

This also fixes lowres use with ffplay

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

ffplay: dont forget passing lowres to private options

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

jpeg2000: merge mant type from j2k

mant fits in 16bit

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

configure: make jack depend on pthreads

j2k/jpeg2000: merge j2k & jpeg2000 dwts, drop j2k dwt

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

avconv: make -aspect work with streamcopy

matroskadec: silently skip CodecState element.

mkvmerge apparrently uses it for mpeg1/2 video, but it contains the same
information as CodecPrivate, so it can be ignored.

lavfi/haldclutsrc: 10l remove size options.

lavfi/overlay: remove do_blend forward declaration.

lavfi/lut3d: move lut3d init to its definition scope.

lavfi: add haldclut filter.

Fixes Ticket #2517.

lavfi: add dual input helpers.

lavfi: add haldclutsrc filter.

j2k_dwt: fix scaling of 9/7 dwt

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

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>

smacker: fix off-by-one error in palette expanding code

Revert "smackaud: clip output samples"

Smacker audio uses overflows instead of clipping.

This reverts commit 375ca0aca81be2951d9ba4731196e70e490d3cdf.

j2k: change fixed point of stepsize to 16.16

This seems more natural and matches jpeg2000

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

j2k/jpeg2000: Partially merge quantization code

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

j2k/jpeg2000: merge a few whitespaces

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

j2k: drop cblknx/y from Jpeg2000Band

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

j2k/jpeg2000: drop xi/yi0/1 from  Jpeg2000Prec

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

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>

j2kdec: merge decode_tile cblk handling from jpeg2000

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

j2kdec: cdxy != 1 does not work, print an error

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

j2k/jpeg2000: restructure cblk coord

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

j2k: fix band coord

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

j2kdec: merge cblk restructuring from jpeg2000

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

j2kenc: switch to cblk in prec

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

j2k: merge precinct init code from jpeg2000

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

j2k/jpeg2000 headers: Cblk/Prec cleanup & merge

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

lavfi/ocv: make use of AVFILTER_DEFINE_CLASS

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavfi/frei0r: make use of AVFILTER_DEFINE_CLASS

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavfi/channelmap: make use of AVFILTER_DEFINE_CLASS

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavfi/format: make use of AVFILTER_DEFINE_CLASS

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavfi/setpts: make use of AVFILTER_DEFINE_CLASS

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavfi/join: make use of AVFILTER_DEFINE_CLASS

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavfi/hqdn3d: make use of AVFILTER_DEFINE_CLASS

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavfi/interlace: make use of AVFILTER_DEFINE_CLASS

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavfi/trim: make use of AVFILTER_DEFINE_CLASS

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavfi/interlace: remove request frame hack

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavfi/trim: remove request frame hack

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavfi/tinterlace: remove request frame hack

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavfi/idet: remove request_frame hack

Signed-off-by: Paul B Mahol <onemda@gmail.com>

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>

avcodec/vda_h264_dec: fix a memory leak

Signed-off-by: Sebastien Zwickert <dilaroga@gmail.com>

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>

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>

j2k: merge cosmetics and non functional changes from jpeg2000

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

libtwolame: add forgotten calls

Signed-off-by: Paul B Mahol <onemda@gmail.com>

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>