Michael Niedermayer
1e7a92f219
Merge commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76'
...
* commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76':
dsputil: remove one array dimension from avg_no_rnd_pixels_tab.
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 18:15:29 +01:00
Michael Niedermayer
f900fd5d31
Merge commit '2612c4dc78e1750c4653bf5a9f2cbe95f7b4ed6e'
...
* commit '2612c4dc78e1750c4653bf5a9f2cbe95f7b4ed6e':
dsputil: remove 9/10 bits hpel functions.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 18:06:57 +01:00
Michael Niedermayer
70270f2753
Merge commit '2bef1a83d7a3ca60b161ab90bf4d4338e5def5e7'
...
* commit '2bef1a83d7a3ca60b161ab90bf4d4338e5def5e7':
dsputil: remove some never-assigned function pointers from the struct.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 17:58:46 +01:00
Michael Niedermayer
6d1e9d993a
Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836'
...
* commit '32ff6432284f713e9f837ee5b36fc8e9f1902836':
dsputil: remove avg_no_rnd_pixels8.
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 17:52:21 +01:00
Michael Niedermayer
ac8987591f
Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'
...
* commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f':
Drop DCTELEM typedef
Conflicts:
libavcodec/alpha/dsputil_alpha.h
libavcodec/alpha/motion_est_alpha.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/bfin/dsputil_bfin.h
libavcodec/bfin/pixels_bfin.S
libavcodec/cavs.c
libavcodec/cavsdec.c
libavcodec/dct-test.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/eamad.c
libavcodec/h264_cavlc.c
libavcodec/h264idct_template.c
libavcodec/mpeg12.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/ppc/dsputil_altivec.c
libavcodec/proresdsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 17:44:56 +01:00
Michael Niedermayer
b90ab2b993
Merge commit '2e4bb99f4df7052b3e147ee898fcb4013a34d904'
...
* commit '2e4bb99f4df7052b3e147ee898fcb4013a34d904':
vorbisdsp: convert x86 simd functions from inline asm to yasm.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 17:00:26 +01:00
Michael Niedermayer
516f30ed20
Merge commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a'
...
* commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a':
vp3dsp: don't do aligned reads on input.
mlp_parser: cosmetics: re-indent.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 16:52:09 +01:00
Michael Niedermayer
0ff21c3165
mlpdec: remove disabled code, leftover from merge
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 16:50:52 +01:00
Michael Niedermayer
826188d27a
Merge commit 'ed1b01131e662c9086b27aaaea69684d8575fbea'
...
* commit 'ed1b01131e662c9086b27aaaea69684d8575fbea':
mlp: implement support for AVCodecContext.request_channel_layout.
Conflicts:
libavcodec/mlpdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 16:44:30 +01:00
Michael Niedermayer
86b892af19
Merge commit 'b0c7e3ffd09f68022429920da483ad7abed84aa1'
...
* commit 'b0c7e3ffd09f68022429920da483ad7abed84aa1':
mlp_parser: account for AVCodecContext.request_channels when setting the channel layout.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 16:34:52 +01:00
Michael Niedermayer
1cf6f6f3da
Merge commit '1fd2deedcc6400e08b31566a547a5fac3b38cefb'
...
* commit '1fd2deedcc6400e08b31566a547a5fac3b38cefb':
mlpdec: set the channel layout.
Conflicts:
libavcodec/mlpdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 16:12:05 +01:00
Michael Niedermayer
cd6a8618b1
Merge commit '3ffcccb4fbaae4d5ad775506f1f2761f2029affa'
...
* commit '3ffcccb4fbaae4d5ad775506f1f2761f2029affa':
mlpdec: TrueHD: use Libav channel order.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 16:05:56 +01:00
Michael Niedermayer
fa36270c4c
Merge commit '99ccd2ba10eac2b282c272ad9e75f082123c765a'
...
* commit '99ccd2ba10eac2b282c272ad9e75f082123c765a':
mlp: store the channel layout for each substream.
Conflicts:
libavcodec/mlp_parser.c
libavcodec/mlpdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 15:52:39 +01:00
Michael Niedermayer
8102f27b5b
Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9'
...
* commit '73b704ac609d83e0be124589f24efd9b94947cf9':
arm: Add some missing header #includes
floatdsp: move scalarproduct_float from dsputil to avfloatdsp.
Conflicts:
libavcodec/acelp_pitch_delay.c
libavcodec/amrnbdec.c
libavcodec/amrwbdec.c
libavcodec/ra288.c
libavcodec/x86/dsputil_mmx.c
libavutil/x86/float_dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 14:31:55 +01:00
Michael Niedermayer
24604ebaf8
Merge commit '5959bfaca396ecaf63a8123055f499688b79cae3'
...
* commit '5959bfaca396ecaf63a8123055f499688b79cae3':
floatdsp: move butterflies_float from dsputil to avfloatdsp.
Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/imc.c
libavcodec/mpegaudiodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 14:13:54 +01:00
Michael Niedermayer
6e6e170898
Merge commit '42d324694883cdf1fff1612ac70fa403692a1ad4'
...
* commit '42d324694883cdf1fff1612ac70fa403692a1ad4':
floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp.
Conflicts:
libavcodec/arm/dsputil_init_vfp.c
libavcodec/arm/dsputil_vfp.S
libavcodec/dsputil.c
libavcodec/ppc/float_altivec.c
libavcodec/x86/dsputil.asm
libavutil/x86/float_dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 14:04:50 +01:00
Michael Niedermayer
b1b870fbd7
Merge commit '55aa03b9f8f11ebb7535424cc0e5635558590f49'
...
* commit '55aa03b9f8f11ebb7535424cc0e5635558590f49':
floatdsp: move vector_fmul_add from dsputil to avfloatdsp.
Conflicts:
libavcodec/dsputil.c
libavcodec/x86/dsputil.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 13:54:34 +01:00
Paul B Mahol
205b2d2a98
adcpmenc: remove unused header
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-23 11:21:09 +00:00
Paul B Mahol
a2dd988bf8
jpeglsenc: add missing put_bits.h header
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-23 11:21:09 +00:00
Paul B Mahol
be38aaba4a
ffv1enc: include correct header
...
Encoder needs put_bits.h, not get_bits.h
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-23 11:21:09 +00:00
Paul B Mahol
6f465c6219
dcaenc: remove unused header
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-23 11:21:09 +00:00
Paul B Mahol
92d874cb78
flacenc: include correct header
...
Encoder needs put_bits.h, not get_bits.h
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-23 11:21:09 +00:00
Michael Niedermayer
713dea584b
truemotion2: use av_mallocz()
...
Fixes use of uninitialized values.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 05:25:04 +01:00
Michael Niedermayer
e49c2aab80
truemotion2: clear the token array if its initialization fails.
...
Fixes use of uninitialized and half initialized values, which
can occur on several error pathes
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 05:24:08 +01:00
Ronald S. Bultje
baf35bb4bc
dsputil: remove one array dimension from avg_no_rnd_pixels_tab.
2013-01-22 18:41:36 -08:00
Ronald S. Bultje
2612c4dc78
dsputil: remove 9/10 bits hpel functions.
...
These are never used.
2013-01-22 18:41:36 -08:00
Ronald S. Bultje
2bef1a83d7
dsputil: remove some never-assigned function pointers from the struct.
2013-01-22 18:41:36 -08:00
Ronald S. Bultje
32ff643228
dsputil: remove avg_no_rnd_pixels8.
...
This is never used.
2013-01-22 18:41:36 -08:00
Diego Biurrun
88bd7fdc82
Drop DCTELEM typedef
...
It does not help as an abstraction and adds dsputil dependencies.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2013-01-22 18:32:56 -08:00
Ronald S. Bultje
2e4bb99f4d
vorbisdsp: convert x86 simd functions from inline asm to yasm.
2013-01-22 18:02:24 -08:00
Ronald S. Bultje
0ee8293a77
vp3dsp: don't do aligned reads on input.
...
The input is not guaranteed to be aligned.
2013-01-22 17:32:07 -08:00
Michael Niedermayer
1bb05797ec
sanm: remove "duplicate" for loop.
...
Fixes input buffer overread
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-22 22:29:23 +01:00
Tim Walker
ed1b01131e
mlp: implement support for AVCodecContext.request_channel_layout.
...
Also wrap usage of AVCodecContext.request_channels in FF_API_REQUEST_CHANNELS directives.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
2013-01-22 16:10:02 -05:00
Tim Walker
b0c7e3ffd0
mlp_parser: account for AVCodecContext.request_channels when setting the channel layout.
...
Allows users to configure the output based on what's actually decoded, rather than the full native layout.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
2013-01-22 16:10:02 -05:00
Tim Walker
1fd2deedcc
mlpdec: set the channel layout.
...
Fixes bug 401.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
CC:libav-stable@libav.org
2013-01-22 16:10:02 -05:00
Tim Walker
3ffcccb4fb
mlpdec: TrueHD: use Libav channel order.
...
Fixes bug 208.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
CC:libav-stable@libav.org
2013-01-22 16:10:02 -05:00
Tim Walker
99ccd2ba10
mlp: store the channel layout for each substream.
...
Also stop storing the channel arrangement in the header info, as it's unused outside of ff_mlp_read_major_sync.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
CC:libav-stable@libav.org
2013-01-22 16:10:02 -05:00
Tim Walker
40cf1add12
mlp_parser: cosmetics: re-indent.
...
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
2013-01-22 16:10:02 -05:00
Michael Niedermayer
49b729d3af
sanm: check image dimensions before using them
...
Avoids integer overflows and out of array accesses.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-22 21:39:56 +01:00
Diego Biurrun
73b704ac60
arm: Add some missing header #includes
2013-01-22 21:24:10 +01:00
Ronald S. Bultje
5959bfaca3
floatdsp: move butterflies_float from dsputil to avfloatdsp.
...
This makes wmadec/enc, twinvq and mpegaudiodec (i.e. mp2/mp3)
independent of dsputil.
2013-01-22 11:55:42 -08:00
Ronald S. Bultje
42d3246948
floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp.
...
Now, nellymoserenc and aacenc no longer depends on dsputil. Independent
of this patch, wmaprodec also does not depend on dsputil, so I removed
it from there also.
2013-01-22 11:55:42 -08:00
Ronald S. Bultje
55aa03b9f8
floatdsp: move vector_fmul_add from dsputil to avfloatdsp.
2013-01-22 11:55:42 -08:00
Ronald S. Bultje
d56668bd80
floatdsp: move scalarproduct_float from dsputil to avfloatdsp.
...
This makes the aac decoder and all voice codecs independent of dsputil.
2013-01-22 11:55:42 -08:00
Paul B Mahol
c4274d118b
lagarith: return more meaningful error codes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-22 19:48:23 +00:00
Carl Eugen Hoyos
40297a8bdb
Support solid gray frames when decoding Lagarith.
...
Fixes bug 431.
2013-01-22 20:17:53 +01:00
Michael Niedermayer
26345acb0e
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
proresdec: support mixed interlaced/non-interlaced content
vp3/5: move put_no_rnd_pixels_l2 from dsputil to VP3DSPContext.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-22 15:33:23 +01:00
Michael Niedermayer
766f055201
Merge commit '4af5310d29379283553bcd9f541a3f6c317f706e'
...
* commit '4af5310d29379283553bcd9f541a3f6c317f706e':
get_bits/put_bits: K&R formatting cosmetics
Conflicts:
libavcodec/get_bits.h
libavcodec/put_bits.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-22 13:49:45 +01:00
Michael Smith
0881cbf314
proresdec: support mixed interlaced/non-interlaced content
...
Set interlaced to false if we don't have an interlaced frame
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-01-22 05:40:57 +01:00
Michael Niedermayer
b3ab281027
avcodec/x86/cabac: workaround llvm 4.2.1 bug
...
x86_64 is affected by this too
Fixes Ticket2156
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-22 03:43:29 +01:00