ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-17 20:13:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,621 Commits 37 Branches 400 Tags 505 MiB
53015bb3b3
Commit Graph

53621 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Carl Eugen Hoyos
c0957f49c7 configure: Fix jack auto-detection, broken since 3fc8500 2013-05-28 10:28:16 +02:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Kostya Shishkov
851bc1d6be smacker: assign video frame PTS 2013-05-28 09:03:41 +02:00
Michael Niedermayer
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
Michael Niedermayer
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
Anton Khirnov
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
Anton Khirnov
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
Anton Khirnov
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
Michael Niedermayer
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
Anton Khirnov
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
Anton Khirnov
d1bec4be22 wavpack: return an error on 0-sized blocks 
Such blocks are not valid.
 2013-05-28 08:03:37 +02:00
Anton Khirnov
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
Anton Khirnov
0f3a0b24dd wavpack: add an error message to a failure. 2013-05-28 08:03:13 +02:00
Anton Khirnov
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
Anton Khirnov
528daa3990 wavpack: switch to planar output 
This simplifies the code and makes it faster.
 2013-05-28 08:01:30 +02:00
Anton Khirnov
a7ec3a9a4e wavpack: drop redundant if/else blocks 2013-05-28 08:01:16 +02:00
Anton Khirnov
7b44c99180 wavpack: remove the subframes codec cap 
The decoder always consumes full packets.
 2013-05-28 08:01:08 +02:00
Anton Khirnov
c330eba84c lavf: preserve side data when parsing packets. 2013-05-28 08:00:07 +02:00
Michael Niedermayer
97f7586cd6 Merge commit '5f30c6c8ed1f006c1b3a547dfe388f3a4a080e4d' 
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 07:49:38 +02:00
Kostya Shishkov
268bb88544 smacker: add a clarification notice about audio decoding 2013-05-28 06:17:08 +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
Anton Khirnov
a3fc62e89e configure: make jack depend on pthreads 2013-05-27 21:56:14 +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
Anton Khirnov
538bf76737 avconv: make -aspect work with streamcopy 2013-05-27 21:26:06 +02:00
Anton Khirnov
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
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
c3c08baefb smacker: fix off-by-one error in palette expanding code 2013-05-27 18:19:08 +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