]>
git.sesse.net Git - ffmpeg/log
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Clément Bœsch [Fri, 10 May 2013 22:31:09 +0000 (00:31 +0200)]
lavfi/drawutils: attempt to fix subsampling.
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.
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>
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>
Anton Khirnov [Tue, 28 May 2013 15:44:18 +0000 (17:44 +0200)]
lavf: add a raw WavPack muxer.
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.
Anton Khirnov [Tue, 28 May 2013 08:09:21 +0000 (10:09 +0200)]
matroskaenc: support muxing WavPack
Anton Khirnov [Tue, 28 May 2013 07:33:43 +0000 (09:33 +0200)]
wvdec: split block header parsing into a separate file
It will be reused by other muxers and demuxers.
Anton Khirnov [Tue, 28 May 2013 06:55:52 +0000 (08:55 +0200)]
lavf: rename wv.c to wvdec.c
wv.c will be used for shared wavpack functions.
Anton Khirnov [Mon, 27 May 2013 17:13:14 +0000 (19:13 +0200)]
wavpack: check that all the channels were coded.
Anton Khirnov [Mon, 27 May 2013 17:11:09 +0000 (19:11 +0200)]
wavpack: check that there aren't too many blocks per packet
Anton Khirnov [Mon, 27 May 2013 15:23:15 +0000 (17:23 +0200)]
wavpack: extract channel information from the bitstream
This way we don't require the caller to parse the block header. It also
allows the channel configuration to change mid-stream.
Anton Khirnov [Mon, 27 May 2013 15:23:15 +0000 (17:23 +0200)]
wavpack: extract sample rate from the bitstream
This way we don't require the caller to parse the block header. It also
allows the sample rate to change mid-stream.
Luca Barbato [Tue, 14 May 2013 20:41:14 +0000 (22:41 +0200)]
configure: support gcc-4.8 instrumentation
Since version 4.8 gcc sports asan and tsan integration that can
be leveraged when hunting bugs.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Martin Storsjö [Sun, 19 May 2013 22:55:32 +0000 (01:55 +0300)]
fate: Add a --target-samples path parameter
This allows having the samples accessible via different paths
on the target and on the host.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 19 May 2013 22:46:21 +0000 (01:46 +0300)]
fate: Don't use files from SRC_PATH in the actual tests
If building out of tree, make sure the filter scripts are copied
into the build tree before running tests. This makes sure that
SRC_PATH doesn't need to exist on the remote system (or doesn't
need to exist at the same path).
Signed-off-by: Martin Storsjö <martin@martin.st>
Kostya Shishkov [Sat, 25 May 2013 10:35:12 +0000 (12:35 +0200)]
indeo4: reuse context block VLC for band instead of defaulting
Currently if no custom block VLC is specified for band, a default block VLC
will be used, while the global block VLC stored in the context should be used
instead.
This fixes decoding of one sample I have.
Kostya Shishkov [Sat, 25 May 2013 10:15:37 +0000 (12:15 +0200)]
indeo4: add missing Haar and slanted transforms
That involves fixing INV_HAAR4() macro and changing it to work with different
input and output like INV_HAAR8() instead of in-place transform.
Paul B Mahol [Tue, 28 May 2013 11:46:10 +0000 (11:46 +0000)]
tta: make probing more robust
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Kostya Shishkov [Mon, 27 May 2013 19:58:52 +0000 (21:58 +0200)]
dxtory v2 support
Michael Niedermayer [Fri, 26 Apr 2013 01:44:05 +0000 (03:44 +0200)]
vc1dec: Remove interlaced warning
Also add a note about the feature in the changelog.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Fri, 3 May 2013 15:44:30 +0000 (17:44 +0200)]
vc1dec: Fix mixed field/frame intensity compensation
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 24 Apr 2013 18:42:07 +0000 (20:42 +0200)]
vc1dec: Match addressing between compensation and MC in vc1_mc_4mv_chroma4
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 25 Apr 2013 19:30:41 +0000 (21:30 +0200)]
vc1dec: Handle top and bottom blocks in vc1_mc_4mv_chroma4() differently if needed
Now it can use different references for those blocks and even use
averaging.
This fixes several chroma artifacts in several videos.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 25 Apr 2013 18:35:35 +0000 (20:35 +0200)]
vc1dec: Fix doxy for vc1_mc_4mv_chroma4()
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 24 Apr 2013 19:56:34 +0000 (21:56 +0200)]
vc1dec: Drop old use_ic code from vc1_b_mc
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 24 Apr 2013 18:27:34 +0000 (20:27 +0200)]
vc1: Use shuffled use_ic instead of equally shuffled mv_mode
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 24 Apr 2013 18:41:31 +0000 (20:41 +0200)]
vc1dec: Implement intensity compensation for vc1_interp_mc()
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 24 Apr 2013 18:40:12 +0000 (20:40 +0200)]
vc1dec: Redesign the intensity compensation
Use the intensity-compensated reference frame for subsequent
fields/B-frames.
Since we currently don't change the reference frame we have to
maintain lookup tables for intensity compensation in the following
dependent frames.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 24 Apr 2013 11:16:27 +0000 (13:16 +0200)]
vc1dec: Shuffle field MVs after decoding, not before
This simplifies the code since copying MVs to the reference is not needed
anymore (and maybe something about fixing artifacts).
Also remove the unused mv_f_last.
Fixes a small number of artifacts in black_screen_VC-1.mkv
and several more artifacts in other videos.
Signed-off-by: Martin Storsjö <martin@martin.st>
Dave Yeo [Tue, 28 May 2013 06:26:59 +0000 (23:26 -0700)]
avcodec/vp8: Cosmetics, maintain alphabetical order in threading headers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Dave Yeo [Tue, 28 May 2013 06:22:10 +0000 (23:22 -0700)]
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>
Paul B Mahol [Tue, 28 May 2013 10:05:58 +0000 (10:05 +0000)]
lavf/wvenc: remove hacks since wavpack demuxer & decoder hacks have been fixed
Michael Niedermayer [Tue, 28 May 2013 09:58:46 +0000 (11:58 +0200)]
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>
Michael Niedermayer [Tue, 28 May 2013 09:49:30 +0000 (11:49 +0200)]
Merge commit '
5074f4545c439420daebe4c2f28ed216440b6ec7 '
* commit '
5074f4545c439420daebe4c2f28ed216440b6ec7 ':
wavpack demuxer: export full wavpack blocks.
Conflicts:
libavformat/wv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 28 May 2013 09:41:33 +0000 (11:41 +0200)]
Merge commit '
72dee5f40b236c5eb9e68df39df80c68392269e3 '
* commit '
72dee5f40b236c5eb9e68df39df80c68392269e3 ':
wavpack: don't set sample format in init.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 28 May 2013 09:35:02 +0000 (11:35 +0200)]
Merge commit '
35596bd4f4d3c39eed838cf3a2613817d62dda99 '
* commit '
35596bd4f4d3c39eed838cf3a2613817d62dda99 ':
wavpack: remove a useless parameter from wavpack_decode_block().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 28 May 2013 09:28:18 +0000 (11:28 +0200)]
Merge commit '
d1bec4be2207738669874e02605e879ea9620974 '
* commit '
d1bec4be2207738669874e02605e879ea9620974 ':
wavpack: return an error on 0-sized blocks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 28 May 2013 09:13:00 +0000 (11:13 +0200)]
Merge commit '
1d177200ce1ffd8902729e3a4d647b04fc4b35f8 '
* commit '
1d177200ce1ffd8902729e3a4d647b04fc4b35f8 ':
wavpack: remove a useless check.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 28 May 2013 09:08:24 +0000 (11:08 +0200)]
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>
Michael Niedermayer [Tue, 28 May 2013 08:56:25 +0000 (10:56 +0200)]
wavpack: Properly check channel index, dont write out of arrays
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 28 May 2013 09:02:22 +0000 (11:02 +0200)]
Merge commit '
528daa399018af74d52192eb1861d2b59d256111 '
* commit '
528daa399018af74d52192eb1861d2b59d256111 ':
wavpack: switch to planar output
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 28 May 2013 08:28:16 +0000 (10:28 +0200)]
configure: Fix jack auto-detection, broken since
3fc8500
Michael Niedermayer [Tue, 28 May 2013 08:02:56 +0000 (10:02 +0200)]
Merge commit '
a7ec3a9a4eea4e374afcd6e05828b103e6fcb601 '
* commit '
a7ec3a9a4eea4e374afcd6e05828b103e6fcb601 ':
wavpack: drop redundant if/else blocks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 28 May 2013 07:57:40 +0000 (09:57 +0200)]
Merge commit '
7b44c9918086c6aeacf7ef9f902af38b97f43170 '
* commit '
7b44c9918086c6aeacf7ef9f902af38b97f43170 ':
wavpack: remove the subframes codec cap
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 28 May 2013 07:50:15 +0000 (09:50 +0200)]
Merge commit '
c330eba84cf2370ad72423aa9e410e20afdc52e2 '
* commit '
c330eba84cf2370ad72423aa9e410e20afdc52e2 ':
lavf: preserve side data when parsing packets.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 28 May 2013 07:35:56 +0000 (09:35 +0200)]
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>
Michael Niedermayer [Tue, 28 May 2013 07:30:28 +0000 (09:30 +0200)]
jpeg2000dwt: remove floats from mixed float/int 9/7 dwt
This should fix some fate failures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kostya Shishkov [Mon, 27 May 2013 03:45:29 +0000 (05:45 +0200)]
smacker: assign video frame PTS
Michael Niedermayer [Tue, 28 May 2013 06:59:07 +0000 (08:59 +0200)]
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>
Michael Niedermayer [Tue, 28 May 2013 06:52:03 +0000 (08:52 +0200)]
Merge commit '
538bf767373f176b6487e30181155e74b37cced6 '
* commit '
538bf767373f176b6487e30181155e74b37cced6 ':
avconv: make -aspect work with streamcopy
Conflicts:
ffmpeg.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Mon, 27 May 2013 07:44:27 +0000 (09:44 +0200)]
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.
Anton Khirnov [Sun, 26 May 2013 19:09:22 +0000 (21:09 +0200)]
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.
Anton Khirnov [Sun, 26 May 2013 09:02:51 +0000 (11:02 +0200)]
wavpack: don't set sample format in init.
We don't know whether it will be float until we look at the data.
Michael Niedermayer [Tue, 28 May 2013 06:04:02 +0000 (08:04 +0200)]
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>
Anton Khirnov [Sun, 26 May 2013 08:47:22 +0000 (10:47 +0200)]
wavpack: remove a useless parameter from wavpack_decode_block().
The decoder always returns output if an error does not occur.
Anton Khirnov [Sun, 26 May 2013 08:44:11 +0000 (10:44 +0200)]
wavpack: return an error on 0-sized blocks
Such blocks are not valid.
Anton Khirnov [Sun, 26 May 2013 08:39:55 +0000 (10:39 +0200)]
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.
Anton Khirnov [Sun, 26 May 2013 08:38:54 +0000 (10:38 +0200)]
wavpack: add an error message to a failure.
Anton Khirnov [Sun, 26 May 2013 08:32:56 +0000 (10:32 +0200)]
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.
Anton Khirnov [Sat, 25 May 2013 13:31:18 +0000 (15:31 +0200)]
wavpack: switch to planar output
This simplifies the code and makes it faster.
Anton Khirnov [Sat, 25 May 2013 05:49:25 +0000 (07:49 +0200)]
wavpack: drop redundant if/else blocks
Anton Khirnov [Sat, 25 May 2013 04:44:14 +0000 (06:44 +0200)]
wavpack: remove the subframes codec cap
The decoder always consumes full packets.
Anton Khirnov [Fri, 17 May 2013 05:39:34 +0000 (07:39 +0200)]
lavf: preserve side data when parsing packets.
Michael Niedermayer [Tue, 28 May 2013 05:48:51 +0000 (07:48 +0200)]
Merge commit '
5f30c6c8ed1f006c1b3a547dfe388f3a4a080e4d '
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Kostya Shishkov [Mon, 27 May 2013 16:21:04 +0000 (18:21 +0200)]
smacker: add a clarification notice about audio decoding
Michael Niedermayer [Tue, 28 May 2013 00:47:25 +0000 (02:47 +0200)]
j2kenc: Zero DWT struct on allocation
Should fix fate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 27 May 2013 23:31:07 +0000 (01:31 +0200)]
j2kdec: random non functional changed from jpeg2000
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 27 May 2013 23:10:26 +0000 (01:10 +0200)]
j2kdec: merge get_tlm() from jpeg2000
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>