269fc8e049
lavf/wvenc: remove hacks since wavpack demuxer & decoder hacks have been fixed
2013-05-28 10:46:57 +00:00
3ed3aaab32
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>
2013-05-28 11:58:46 +02:00
8012f93ed8
Merge commit '5074f4545c439420daebe4c2f28ed216440b6ec7'
...
* commit '5074f4545c439420daebe4c2f28ed216440b6ec7':
wavpack demuxer: export full wavpack blocks.
Conflicts:
libavformat/wv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 11:49:30 +02:00
aa6cf4c1b0
Merge commit '72dee5f40b236c5eb9e68df39df80c68392269e3'
...
* commit '72dee5f40b236c5eb9e68df39df80c68392269e3':
wavpack: don't set sample format in init.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 11:41:38 +02:00
288e3fdfd3
Merge commit '35596bd4f4d3c39eed838cf3a2613817d62dda99'
...
* commit '35596bd4f4d3c39eed838cf3a2613817d62dda99':
wavpack: remove a useless parameter from wavpack_decode_block().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 11:36:26 +02:00
f5dfc35157
Merge commit 'd1bec4be2207738669874e02605e879ea9620974'
...
* commit 'd1bec4be2207738669874e02605e879ea9620974':
wavpack: return an error on 0-sized blocks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 11:28:22 +02:00
2ba0953ee4
Merge commit '1d177200ce1ffd8902729e3a4d647b04fc4b35f8'
...
* commit '1d177200ce1ffd8902729e3a4d647b04fc4b35f8':
wavpack: remove a useless check.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 11:13:14 +02:00
8d4e934df9
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>
2013-05-28 11:08:24 +02:00
107e9e4432
wavpack: Properly check channel index, dont write out of arrays
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 11:02:37 +02:00
a803ca54e5
Merge commit '528daa399018af74d52192eb1861d2b59d256111'
...
* commit '528daa399018af74d52192eb1861d2b59d256111':
wavpack: switch to planar output
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 11:02:27 +02:00
c0957f49c7
configure: Fix jack auto-detection, broken since 3fc8500
2013-05-28 10:28:16 +02:00
84051d57f5
Merge commit 'a7ec3a9a4eea4e374afcd6e05828b103e6fcb601'
...
* commit 'a7ec3a9a4eea4e374afcd6e05828b103e6fcb601':
wavpack: drop redundant if/else blocks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 10:03:04 +02:00
be72853f8a
Merge commit '7b44c9918086c6aeacf7ef9f902af38b97f43170'
...
* commit '7b44c9918086c6aeacf7ef9f902af38b97f43170':
wavpack: remove the subframes codec cap
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 09:57:44 +02:00
f6beb36115
Merge commit 'c330eba84cf2370ad72423aa9e410e20afdc52e2'
...
* commit 'c330eba84cf2370ad72423aa9e410e20afdc52e2':
lavf: preserve side data when parsing packets.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 09:51:19 +02:00
197e219c92
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>
2013-05-28 09:42:19 +02:00
cf05fe8a7e
jpeg2000dwt: remove floats from mixed float/int 9/7 dwt
...
This should fix some fate failures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 09:35:49 +02:00
851bc1d6be
smacker: assign video frame PTS
2013-05-28 09:03:41 +02:00
3fc8500483
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>
2013-05-28 08:59:07 +02:00
2ad28840b3
Merge commit '538bf767373f176b6487e30181155e74b37cced6'
...
* commit '538bf767373f176b6487e30181155e74b37cced6':
avconv: make -aspect work with streamcopy
Conflicts:
ffmpeg.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 08:52:03 +02:00
9b6f47c448
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.
2013-05-28 08:14:35 +02:00
5074f4545c
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.
2013-05-28 08:14:05 +02:00
72dee5f40b
wavpack: don't set sample format in init.
...
We don't know whether it will be float until we look at the data.
2013-05-28 08:04:07 +02:00
91db8ff203
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>
2013-05-28 08:04:02 +02:00
35596bd4f4
wavpack: remove a useless parameter from wavpack_decode_block().
...
The decoder always returns output if an error does not occur.
2013-05-28 08:03:57 +02:00
d1bec4be22
wavpack: return an error on 0-sized blocks
...
Such blocks are not valid.
2013-05-28 08:03:37 +02:00
1d177200ce
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.
2013-05-28 08:03:24 +02:00
0f3a0b24dd
wavpack: add an error message to a failure.
2013-05-28 08:03:13 +02:00
474fb0c9d9
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.
2013-05-28 08:03:02 +02:00
528daa3990
wavpack: switch to planar output
...
This simplifies the code and makes it faster.
2013-05-28 08:01:30 +02:00
a7ec3a9a4e
wavpack: drop redundant if/else blocks
2013-05-28 08:01:16 +02:00
7b44c99180
wavpack: remove the subframes codec cap
...
The decoder always consumes full packets.
2013-05-28 08:01:08 +02:00
c330eba84c
lavf: preserve side data when parsing packets.
2013-05-28 08:00:07 +02:00
97f7586cd6
Merge commit '5f30c6c8ed1f006c1b3a547dfe388f3a4a080e4d'
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 07:49:38 +02:00
268bb88544
smacker: add a clarification notice about audio decoding
2013-05-28 06:17:08 +02:00
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
05fa3f6802
j2kdec: random non functional changed from jpeg2000
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 01:46:59 +02:00
d66de3801e
j2kdec: merge get_tlm() from jpeg2000
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 01:11:30 +02:00
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
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
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
a3fc62e89e
configure: make jack depend on pthreads
2013-05-27 21:56:14 +02:00
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
538bf76737
avconv: make -aspect work with streamcopy
2013-05-27 21:26:06 +02:00
564b7e0c00
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.
2013-05-27 21:25:53 +02:00
160ea26560
lavfi/haldclutsrc: 10l remove size options.
2013-05-27 20:53:25 +02:00
92a2d12a71
lavfi/overlay: remove do_blend forward declaration.
2013-05-27 20:42:46 +02:00
ae5738248a
lavfi/lut3d: move lut3d init to its definition scope.
2013-05-27 20:42:46 +02:00
158d96e3f0
lavfi: add haldclut filter.
...
Fixes Ticket #2517 .
2013-05-27 20:42:28 +02:00
4328602890
lavfi: add dual input helpers.
2013-05-27 20:32:28 +02:00
3cec29cf59
lavfi: add haldclutsrc filter.
2013-05-27 20:32:28 +02:00
Paul B Mahol
Michael Niedermayer
Carl Eugen Hoyos
Kostya Shishkov
Anton Khirnov
Clément Bœsch