ffmpeg.git
6 years agoj2kdec: merge JPEG2000_PGOD_CPRL code from jpeg2000
Michael Niedermayer [Thu, 30 May 2013 23:46:07 +0000 (01:46 +0200)]
j2kdec: merge JPEG2000_PGOD_CPRL code from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2kdec: merge picture handling from jpeg2000
Michael Niedermayer [Thu, 30 May 2013 23:32:36 +0000 (01:32 +0200)]
j2kdec: merge picture handling from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k: restructure bitstream decoding
Michael Niedermayer [Thu, 30 May 2013 22:46:45 +0000 (00:46 +0200)]
j2k: restructure  bitstream decoding

This is based on jpeg2000 but differs because of
problems with the design from jpeg2000 with currently
supported files

More files can be decoded after this commit, though they
show heavy artifacts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k/jpeg2000: merge some of the tilepart related code
Michael Niedermayer [Thu, 30 May 2013 19:12:14 +0000 (21:12 +0200)]
j2k/jpeg2000: merge some of the tilepart related code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2kdec: merge length==0 check from jpeg2000
Michael Niedermayer [Thu, 30 May 2013 19:01:34 +0000 (21:01 +0200)]
j2kdec: merge length==0 check from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000deci/j2kdec: fix sizeof types
Michael Niedermayer [Thu, 30 May 2013 18:54:52 +0000 (20:54 +0200)]
jpeg2000deci/j2kdec: fix sizeof types

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec: fix ff_mqc_initdec() and data setup order
Michael Niedermayer [Thu, 30 May 2013 17:54:59 +0000 (19:54 +0200)]
jpeg2000dec: fix ff_mqc_initdec() and data setup order

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec: simplify init_tile() / merge from j2k
Michael Niedermayer [Thu, 30 May 2013 17:46:39 +0000 (19:46 +0200)]
jpeg2000dec: simplify init_tile() / merge from j2k

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/id3v2enc: fix cover art display on some software
Matthieu Bouron [Wed, 29 May 2013 10:05:26 +0000 (12:05 +0200)]
lavf/id3v2enc: fix cover art display on some software

Adding an arbitrary amount of padding bytes at the end of the
ID3 metadata fixes cover art display for some software (iTunes,
Traktor, Serato, Torq).

For reference (ID3 metadata):

[ Apic frames ]                      -> cover doesn't show up
[ Apic frames, Padding ]             -> ok
[ Apic frames, ID3 frames ]          -> ok
[ ID3 frames, Apic frames ]          -> cover doesn't show up
[ ID3 frames, Apic frames, Padding ] -> ok

6 years agotta: remove pointless code
Paul B Mahol [Thu, 30 May 2013 19:57:47 +0000 (19:57 +0000)]
tta: remove pointless code

Checking seek table crc in decoder is pointless, as seek table is not used in
decoder anyway, so also stop storing seek table into extradata.

6 years agolavfi/vignette: add aspect option.
Clément Bœsch [Thu, 30 May 2013 18:27:55 +0000 (20:27 +0200)]
lavfi/vignette: add aspect option.

6 years agolavfi/vignette: add some scaling debug.
Clément Bœsch [Thu, 30 May 2013 18:41:56 +0000 (20:41 +0200)]
lavfi/vignette: add some scaling debug.

6 years agolavfi/vignette: simplify dmax definition.
Clément Bœsch [Thu, 30 May 2013 18:41:37 +0000 (20:41 +0200)]
lavfi/vignette: simplify dmax definition.

6 years agolavfi/vignette: fix scale with aspects smaller than one.
Clément Bœsch [Thu, 30 May 2013 18:40:39 +0000 (20:40 +0200)]
lavfi/vignette: fix scale with aspects smaller than one.

6 years agoh264_cavlc: fix reading skip run
Michael Niedermayer [Thu, 30 May 2013 16:30:42 +0000 (18:30 +0200)]
h264_cavlc: fix reading skip run

Fixes Ticket2606

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000/j2k: merge non functional changes
Michael Niedermayer [Thu, 30 May 2013 15:14:19 +0000 (17:14 +0200)]
jpeg2000/j2k: merge non functional changes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k:decode_tile() pass picture as argument
Michael Niedermayer [Thu, 30 May 2013 15:03:07 +0000 (17:03 +0200)]
j2k:decode_tile() pass picture as argument

Reduce diff to jpeg2000dec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000: drop red-blue swap
Michael Niedermayer [Thu, 30 May 2013 15:00:43 +0000 (17:00 +0200)]
jpeg2000: drop red-blue swap

This should no longer be needed as the pix fmt was updated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2kdec: s/j2k_/jpeg2000_/
Michael Niedermayer [Thu, 30 May 2013 14:54:09 +0000 (16:54 +0200)]
j2kdec: s/j2k_/jpeg2000_/

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/vignette: make sure a sane sar is set.
Clément Bœsch [Thu, 30 May 2013 16:13:04 +0000 (18:13 +0200)]
lavfi/vignette: make sure a sane sar is set.

6 years agolavfi: add vignette filter.
Clément Bœsch [Tue, 2 Apr 2013 10:48:32 +0000 (12:48 +0200)]
lavfi: add vignette filter.

6 years agoj2k/jpeg2000: merge pix_fmt setting code
Michael Niedermayer [Thu, 30 May 2013 14:45:30 +0000 (16:45 +0200)]
j2k/jpeg2000: merge pix_fmt setting code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo_enc: allow mpeg_quant to be set in mpeg2video
Michael Niedermayer [Thu, 30 May 2013 14:07:07 +0000 (16:07 +0200)]
mpegvideo_enc: allow mpeg_quant to be set in mpeg2video

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000/j2k: merge j2k/jpeg2000.c/h
Michael Niedermayer [Thu, 30 May 2013 12:40:58 +0000 (14:40 +0200)]
jpeg2000/j2k: merge j2k/jpeg2000.c/h

Now only j2kdec / jpeg2000dec.c remain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000: remove unneeded casts
Michael Niedermayer [Thu, 30 May 2013 12:35:34 +0000 (14:35 +0200)]
jpeg2000: remove unneeded casts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000: merges quantization fixes from j2k
Michael Niedermayer [Thu, 30 May 2013 12:34:33 +0000 (14:34 +0200)]
jpeg2000: merges quantization fixes from j2k

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000: remove unneeded variable initialization
Michael Niedermayer [Thu, 30 May 2013 12:32:45 +0000 (14:32 +0200)]
jpeg2000: remove unneeded variable initialization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000: tag_tree_size: replace check by assert
Michael Niedermayer [Thu, 30 May 2013 12:27:03 +0000 (14:27 +0200)]
jpeg2000: tag_tree_size: replace check by assert

This function is never called with values large enough for the
error condition to occur

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k/jpeg2000: split data pointer in int & float.
Michael Niedermayer [Thu, 30 May 2013 12:11:03 +0000 (14:11 +0200)]
j2k/jpeg2000: split data pointer in int & float.

This fixes a TODO item and unifies both decoders structures
It also fixes undefined behavior due to aliasing violations

I choose 2 fields instead of a union because mistakely using the
wrong type with a union will lead to hard to debug "wrong output"
while with 2 fields mistakely using the wrong type will crash
with a null pointer derefernce which is much easier to debug

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoUse -lX11 -lXext when linking Xv output device.
Carl Eugen Hoyos [Thu, 30 May 2013 11:13:57 +0000 (13:13 +0200)]
Use -lX11 -lXext when linking Xv output device.

Reviewed-by: Stefano Sabatini
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 30 May 2013 09:14:10 +0000 (11:14 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: Include hpeldsp_neon.o if h264qpel is enabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'efb7968cfe8b285ab4f27b363719b7c92d19ec74'
Michael Niedermayer [Thu, 30 May 2013 09:02:14 +0000 (11:02 +0200)]
Merge commit 'efb7968cfe8b285ab4f27b363719b7c92d19ec74'

* commit 'efb7968cfe8b285ab4f27b363719b7c92d19ec74':
  arm: Don't unconditionally build dsputil files

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '36a7df8cf1115aa37a1b0d42324ecde5ab6c2304'
Michael Niedermayer [Thu, 30 May 2013 08:57:09 +0000 (10:57 +0200)]
Merge commit '36a7df8cf1115aa37a1b0d42324ecde5ab6c2304'

* commit '36a7df8cf1115aa37a1b0d42324ecde5ab6c2304':
  arm: Only build the FFT init files if FFT is enabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '186599ffe0a94d587434e5e46e190e038357ed99'
Michael Niedermayer [Thu, 30 May 2013 08:45:47 +0000 (10:45 +0200)]
Merge commit '186599ffe0a94d587434e5e46e190e038357ed99'

* commit '186599ffe0a94d587434e5e46e190e038357ed99':
  build: cosmetics: Place unconditional before conditional OBJS lines

Conflicts:
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/encoders: remove duplicated "the"
Stefano Sabatini [Tue, 28 May 2013 17:00:21 +0000 (19:00 +0200)]
doc/encoders: remove duplicated "the"

6 years agolavd: add xv output device
Stefano Sabatini [Tue, 14 May 2013 11:44:29 +0000 (13:44 +0200)]
lavd: add xv output device

Based on the work of Jeff Moguillansky <Jeff.Moguillansky@am.sony.com>.

See thread:
Subject: [FFmpeg-devel] x11 output device for libavdevice
Date: Wed, 10 Apr 2013 23:10:47 +0000

6 years agoMerge commit '9b9b2e9f3036abfd42916bcf734af14b4cb686aa'
Michael Niedermayer [Thu, 30 May 2013 08:37:32 +0000 (10:37 +0200)]
Merge commit '9b9b2e9f3036abfd42916bcf734af14b4cb686aa'

* commit '9b9b2e9f3036abfd42916bcf734af14b4cb686aa':
  build: arm: cosmetics: Place all OBJS declarations in alphabetical order

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '701966730ce10290fd49c5ccedd73f505680f764'
Michael Niedermayer [Thu, 30 May 2013 08:23:50 +0000 (10:23 +0200)]
Merge commit '701966730ce10290fd49c5ccedd73f505680f764'

* commit '701966730ce10290fd49c5ccedd73f505680f764':
  vmd: drop incomplete chunks and spurious samples

Conflicts:
libavcodec/vmdav.c

2 of the changes are replaced by assert0s, as they should
be impossible.
The actual bug is likely caused by a invalid block_align
which is checked for and thus impossible in ffmpeg.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '676da248cad49debc40720baa13214f0b94dcc71'
Michael Niedermayer [Thu, 30 May 2013 07:44:57 +0000 (09:44 +0200)]
Merge commit '676da248cad49debc40720baa13214f0b94dcc71'

* commit '676da248cad49debc40720baa13214f0b94dcc71':
  vmd: refactor the inner decode loop

Conflicts:
libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c8f3cb9119c2183680d44a509a1b5a9817a3bee9'
Michael Niedermayer [Thu, 30 May 2013 07:37:14 +0000 (09:37 +0200)]
Merge commit 'c8f3cb9119c2183680d44a509a1b5a9817a3bee9'

* commit 'c8f3cb9119c2183680d44a509a1b5a9817a3bee9':
  vmd: return meaningful errors

Conflicts:
libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '91a6944e56236234f0a7ba162404665753cbcb51'
Michael Niedermayer [Thu, 30 May 2013 07:28:03 +0000 (09:28 +0200)]
Merge commit '91a6944e56236234f0a7ba162404665753cbcb51'

* commit '91a6944e56236234f0a7ba162404665753cbcb51':
  vmd: use the PALETTE_COUNT constant uniformly

Conflicts:
libavcodec/vmdav.c

No change as the changed line does not exist in ffmpegs vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: fix smvjpeg test
Michael Niedermayer [Thu, 30 May 2013 01:31:04 +0000 (03:31 +0200)]
fate: fix smvjpeg test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavcodec/smvjpegdec: pass flags / idct algo into jpeg avctx
Michael Niedermayer [Thu, 30 May 2013 01:30:01 +0000 (03:30 +0200)]
libavcodec/smvjpegdec: pass flags / idct algo into jpeg avctx

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add smv test
Ash Hughes [Fri, 24 May 2013 14:06:00 +0000 (14:06 +0000)]
fate: add smv test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoarm: Include hpeldsp_neon.o if h264qpel is enabled
Martin Storsjö [Wed, 29 May 2013 18:41:37 +0000 (21:41 +0300)]
arm: Include hpeldsp_neon.o if h264qpel is enabled

A few of the h264qpel neon functions are shared with other
hpeldsp functions in this file.

This fixes standalone compilation of the h264 decoder on arm.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoarm: Don't unconditionally build dsputil files
Martin Storsjö [Wed, 29 May 2013 18:31:46 +0000 (21:31 +0300)]
arm: Don't unconditionally build dsputil files

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoarm: Only build the FFT init files if FFT is enabled
Martin Storsjö [Wed, 29 May 2013 18:08:10 +0000 (21:08 +0300)]
arm: Only build the FFT init files if FFT is enabled

This fixes build errors in cases where FFT is disabled.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agobuild: cosmetics: Place unconditional before conditional OBJS lines
Diego Biurrun [Wed, 29 May 2013 21:15:17 +0000 (23:15 +0200)]
build: cosmetics: Place unconditional before conditional OBJS lines

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agobuild: arm: cosmetics: Place all OBJS declarations in alphabetical order
Diego Biurrun [Wed, 29 May 2013 21:15:16 +0000 (23:15 +0200)]
build: arm: cosmetics: Place all OBJS declarations in alphabetical order

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavformat/mov: Try to detect and support files with invalid sample sizes
Michael Niedermayer [Sat, 25 May 2013 16:44:34 +0000 (18:44 +0200)]
avformat/mov: Try to detect and support files with invalid sample sizes

Fixes Ticket2605

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd AV_HASH_MAX_SIZE.
Reimar Döffinger [Tue, 14 May 2013 20:15:45 +0000 (22:15 +0200)]
Add AV_HASH_MAX_SIZE.

Makes it easier to use static allocation for the result buffer.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agowamenc: handle failure to encode.
Reimar Döffinger [Mon, 13 May 2013 19:38:20 +0000 (21:38 +0200)]
wamenc: handle failure to encode.

This is necessary since the switch to floating point
input means there is no longer sufficient input data
validation.
There is a good chance that other encoders are affected
by similar issues.
This problem can be triggered by trying to encode
extremely large values and probably also with Inf and
possibly also NaNs.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agovmd: drop incomplete chunks and spurious samples
Luca Barbato [Wed, 29 May 2013 14:59:13 +0000 (16:59 +0200)]
vmd: drop incomplete chunks and spurious samples

Odd chunk size makes no sense for stereo and incomplete chunks are
not supported.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agowtvenc: use ffio_fill()
Paul B Mahol [Wed, 29 May 2013 10:56:45 +0000 (10:56 +0000)]
wtvenc: use ffio_fill()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoj2kdec: remove unused variables
Michael Niedermayer [Wed, 29 May 2013 17:57:03 +0000 (19:57 +0200)]
j2kdec: remove unused variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo: fix forgotten lowres op_index limits
Michael Niedermayer [Wed, 29 May 2013 17:55:27 +0000 (19:55 +0200)]
mpegvideo: fix forgotten lowres op_index limits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo: implement ff_put_h264_chroma_mc1 & ff_avg_h264_chroma_mc2
Michael Niedermayer [Wed, 29 May 2013 17:41:55 +0000 (19:41 +0200)]
mpegvideo: implement ff_put_h264_chroma_mc1 & ff_avg_h264_chroma_mc2

These are needed for lowres 3

This may fix Ticket2538

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/noise: fix out of array access
Paul B Mahol [Wed, 29 May 2013 16:54:28 +0000 (16:54 +0000)]
lavfi/noise: fix out of array access

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/noise: support slice threading
Paul B Mahol [Sun, 26 May 2013 11:40:59 +0000 (11:40 +0000)]
lavfi/noise: support slice threading

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agowvenc: remove flush call, not needed since 4f112a8e3
Paul B Mahol [Wed, 29 May 2013 14:25:34 +0000 (14:25 +0000)]
wvenc: remove flush call, not needed since 4f112a8e3

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoremove APEv1 tag writer
Paul B Mahol [Wed, 29 May 2013 14:05:27 +0000 (14:05 +0000)]
remove APEv1 tag writer

Not used anymore.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoapetag: do not create invalid APE tags
Paul B Mahol [Wed, 29 May 2013 14:01:15 +0000 (14:01 +0000)]
apetag: do not create invalid APE tags

APEv2 specifications forbids non-ascii keys.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agotiff: support inverted fill_order for packbits compression
Paul B Mahol [Tue, 28 May 2013 17:20:29 +0000 (17:20 +0000)]
tiff: support inverted fill_order for packbits compression

Fixes #1995.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agotiff: add helper function for fill_order case
Paul B Mahol [Tue, 28 May 2013 17:13:26 +0000 (17:13 +0000)]
tiff: add helper function for fill_order case

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoalac: use init_get_bits8()
Paul B Mahol [Wed, 29 May 2013 12:37:33 +0000 (12:37 +0000)]
alac: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavc/tta: use init_get_bits8()
Paul B Mahol [Wed, 29 May 2013 12:27:41 +0000 (12:27 +0000)]
lavc/tta: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavf/flacenc: use ffio_fill()
Paul B Mahol [Wed, 29 May 2013 10:40:13 +0000 (10:40 +0000)]
lavf/flacenc: use ffio_fill()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agovmd: refactor the inner decode loop
Luca Barbato [Tue, 28 May 2013 20:09:59 +0000 (22:09 +0200)]
vmd: refactor the inner decode loop

Simplify a little, assume empty frames are acceptable and
do not pointlessly reinit the bytestream2 contexts using
possibly wrong size values.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agovmd: return meaningful errors
Luca Barbato [Tue, 28 May 2013 20:00:12 +0000 (22:00 +0200)]
vmd: return meaningful errors

CC: libav-stable@libav.org
6 years agovmd: use the PALETTE_COUNT constant uniformly
Luca Barbato [Tue, 28 May 2013 21:49:43 +0000 (23:49 +0200)]
vmd: use the PALETTE_COUNT constant uniformly

While at it drop useless parentheses.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 29 May 2013 09:19:25 +0000 (11:19 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: Mention the target_samples and ld variables for fate configs
  fate.sh: Allow specifying --as via a specific variable

Conflicts:
doc/fate.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9f30fb5a773d59298d8d45c741b3fd971d84c97b'
Michael Niedermayer [Wed, 29 May 2013 09:06:26 +0000 (11:06 +0200)]
Merge commit '9f30fb5a773d59298d8d45c741b3fd971d84c97b'

* commit '9f30fb5a773d59298d8d45c741b3fd971d84c97b':
  configure: Don't pass -mthumb or -march= to MSVC
  mpeg12: skip frames consistently

Conflicts:
libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2d2d6a4883479403798f4ed46941d5b365823570'
Michael Niedermayer [Wed, 29 May 2013 08:19:20 +0000 (10:19 +0200)]
Merge commit '2d2d6a4883479403798f4ed46941d5b365823570'

* commit '2d2d6a4883479403798f4ed46941d5b365823570':
  lavf: add a raw WavPack muxer.
  apetag: add support for writing APE tags
  matroskaenc: support muxing WavPack

Conflicts:
libavformat/Makefile
libavformat/allformats.c
libavformat/apetag.h
libavformat/version.h
libavformat/wvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '794ca87d2bff2513118de8b97595b3e23070e67d'
Michael Niedermayer [Wed, 29 May 2013 08:06:35 +0000 (10:06 +0200)]
Merge commit '794ca87d2bff2513118de8b97595b3e23070e67d'

* commit '794ca87d2bff2513118de8b97595b3e23070e67d':
  wvdec: split block header parsing into a separate file

Conflicts:
libavformat/Makefile
libavformat/wvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0a1a94450a28eef854162f859e79ecfb9f97915b'
Michael Niedermayer [Wed, 29 May 2013 07:54:13 +0000 (09:54 +0200)]
Merge commit '0a1a94450a28eef854162f859e79ecfb9f97915b'

* commit '0a1a94450a28eef854162f859e79ecfb9f97915b':
  lavf: rename wv.c to wvdec.c

Conflicts:
libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc: Mention the target_samples and ld variables for fate configs
Martin Storsjö [Tue, 28 May 2013 20:03:25 +0000 (23:03 +0300)]
doc: Mention the target_samples and ld variables for fate configs

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agofate.sh: Allow specifying --as via a specific variable
Martin Storsjö [Tue, 28 May 2013 20:00:54 +0000 (23:00 +0300)]
fate.sh: Allow specifying --as via a specific variable

This simplifies specifying a value containing spaces for this
parameter.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge commit '89806691b1c39181c63d95e0fddc30f11e2a7b04'
Michael Niedermayer [Wed, 29 May 2013 02:44:53 +0000 (04:44 +0200)]
Merge commit '89806691b1c39181c63d95e0fddc30f11e2a7b04'

* commit '89806691b1c39181c63d95e0fddc30f11e2a7b04':
  wavpack: check that all the channels were coded.
  wavpack: check that there aren't too many blocks per packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7d039e70a5ff23a7deaa866684d2e8872acc5169'
Michael Niedermayer [Wed, 29 May 2013 02:37:53 +0000 (04:37 +0200)]
Merge commit '7d039e70a5ff23a7deaa866684d2e8872acc5169'

* commit '7d039e70a5ff23a7deaa866684d2e8872acc5169':
  wavpack: extract channel information from the bitstream

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '78f75b6fa421dd39a715588e9487579f1ce5bada'
Michael Niedermayer [Wed, 29 May 2013 02:33:27 +0000 (04:33 +0200)]
Merge commit '78f75b6fa421dd39a715588e9487579f1ce5bada'

* commit '78f75b6fa421dd39a715588e9487579f1ce5bada':
  wavpack: extract sample rate from the bitstream
  configure: support gcc-4.8 instrumentation

Conflicts:
libavcodec/wavpack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'
Michael Niedermayer [Wed, 29 May 2013 02:17:29 +0000 (04:17 +0200)]
Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'

* commit 'ba13606ca6adbc74b4db4a72b0769397d6408791':
  fate: Add a --target-samples path parameter

Conflicts:
configure
tests/fate/audio.mak
tests/fate/cover-art.mak
tests/fate/demux.mak
tests/fate/ea.mak
tests/fate/filter-video.mak
tests/fate/h264.mak
tests/fate/image.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
tests/fate/pcm.mak
tests/fate/prores.mak
tests/fate/qt.mak
tests/fate/real.mak
tests/fate/screen.mak
tests/fate/video.mak
tests/fate/voice.mak
tests/fate/vpx.mak
tests/fate/vqf.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4a27a52a1f74016095b7aee1b4a422cf62217ade'
Michael Niedermayer [Wed, 29 May 2013 02:02:23 +0000 (04:02 +0200)]
Merge commit '4a27a52a1f74016095b7aee1b4a422cf62217ade'

* commit '4a27a52a1f74016095b7aee1b4a422cf62217ade':
  fate: Don't use files from SRC_PATH in the actual tests
  indeo4: reuse context block VLC for band instead of defaulting

Conflicts:
tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6647aa0426e73839b9b1d1c9d86188f469167531'
Michael Niedermayer [Wed, 29 May 2013 01:52:16 +0000 (03:52 +0200)]
Merge commit '6647aa0426e73839b9b1d1c9d86188f469167531'

* commit '6647aa0426e73839b9b1d1c9d86188f469167531':
  indeo4: add missing Haar and slanted transforms
  dxtory v2 support

Conflicts:
libavcodec/indeo4.c
libavcodec/ivi_dsp.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '728214992e3698305550c1762f973d2ac567f016'
Michael Niedermayer [Wed, 29 May 2013 01:28:18 +0000 (03:28 +0200)]
Merge commit '728214992e3698305550c1762f973d2ac567f016'

* commit '728214992e3698305550c1762f973d2ac567f016':
  vc1dec: Remove interlaced warning
  vc1dec: Fix mixed field/frame intensity compensation
  vc1dec: Match addressing between compensation and MC in vc1_mc_4mv_chroma4
  vc1dec: Handle top and bottom blocks in vc1_mc_4mv_chroma4() differently if needed
  vc1dec: Fix doxy for vc1_mc_4mv_chroma4()
  vc1dec: Drop old use_ic code from vc1_b_mc
  vc1: Use shuffled use_ic instead of equally shuffled mv_mode
  vc1dec: Implement intensity compensation for vc1_interp_mc()

Conflicts:
Changelog
libavcodec/vc1dec.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '28243b0d35b47bbf9abbd454fc444a6e0a9e7b71'
Michael Niedermayer [Wed, 29 May 2013 00:59:04 +0000 (02:59 +0200)]
Merge commit '28243b0d35b47bbf9abbd454fc444a6e0a9e7b71'

* commit '28243b0d35b47bbf9abbd454fc444a6e0a9e7b71':
  vc1dec: Redesign the intensity compensation

Conflicts:
libavcodec/vc1.c
libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '93b1281264b87961f53c3e9c134cc2727ecd91ed'
Michael Niedermayer [Wed, 29 May 2013 00:39:07 +0000 (02:39 +0200)]
Merge commit '93b1281264b87961f53c3e9c134cc2727ecd91ed'

* commit '93b1281264b87961f53c3e9c134cc2727ecd91ed':
  vc1dec: Shuffle field MVs after decoding, not before

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k/jpeg2000: merge float DWT and related code
Michael Niedermayer [Tue, 28 May 2013 19:58:48 +0000 (21:58 +0200)]
j2k/jpeg2000: merge float DWT and related code

the float conditions are largely changed to check the DWT
instead of the bitexact flag, which previously was wrong
(DWT53 is always int)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Don't pass -mthumb or -march= to MSVC
Martin Storsjö [Tue, 28 May 2013 20:39:21 +0000 (23:39 +0300)]
configure: Don't pass -mthumb or -march= to MSVC

The modern MSVC for ARM always builds for thumb, and it can't be
disabled.

Also just use the default arch instead of trying to map the -march
parameter to MSVC's -arch parameter (which only takes the values
ARMv7VE and VFPv4).

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoj2kdec:merge mct_decode from jpeg2000
Michael Niedermayer [Tue, 28 May 2013 20:49:57 +0000 (22:49 +0200)]
j2kdec:merge mct_decode from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec: mct_decode: remove unused return
Michael Niedermayer [Tue, 28 May 2013 20:47:11 +0000 (22:47 +0200)]
jpeg2000dec: mct_decode: remove unused return

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: use actual packet pts when discarding for the copypriorss option
Justin Ruggles [Wed, 22 May 2013 17:49:58 +0000 (13:49 -0400)]
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>
6 years agoj2k/jpeg2000: split stepsize in float & int variables
Michael Niedermayer [Tue, 28 May 2013 20:12:34 +0000 (22:12 +0200)]
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>
6 years agojpeg2000dec: remove unneeded returns
Michael Niedermayer [Tue, 28 May 2013 19:36:40 +0000 (21:36 +0200)]
jpeg2000dec: remove unneeded returns

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoj2k/jpeg2000: fix typo in lut_gain index
Michael Niedermayer [Tue, 28 May 2013 17:51:24 +0000 (19:51 +0200)]
j2k/jpeg2000: fix typo in lut_gain index

no testcase

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/drawutils: attempt to fix subsampling.
Clément Bœsch [Fri, 10 May 2013 22:31:09 +0000 (00:31 +0200)]
lavfi/drawutils: attempt to fix subsampling.

6 years agompeg12: skip frames consistently
Janne Grunau [Tue, 21 May 2013 08:40:01 +0000 (10:40 +0200)]
mpeg12: skip frames consistently

The decoder did not start predicted frames with missing references but
called the end of frame handling on them anyway. This caused an
assertion in the VA API HW accelorator since it tried to render a
picture with uninitialized buffers.

6 years agoj2kdec/jpeg2000dec: partially merge quantization code
Michael Niedermayer [Tue, 28 May 2013 12:27:49 +0000 (14:27 +0200)]
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>
6 years agoj2kdec: Try to fix 8bps output case
Michael Niedermayer [Tue, 28 May 2013 15:11:12 +0000 (17:11 +0200)]
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>
6 years agolavf: add a raw WavPack muxer.
Anton Khirnov [Tue, 28 May 2013 15:44:18 +0000 (17:44 +0200)]
lavf: add a raw WavPack muxer.

6 years agoapetag: add support for writing APE tags
Anton Khirnov [Tue, 28 May 2013 15:43:22 +0000 (17:43 +0200)]
apetag: add support for writing APE tags

This will be useful in the WavPack muxer.