summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
* sanm: Check decoded_size.Michael Niedermayer2013-01-24
| | | | | | | This prevents a buffer overflow in rle_decode() Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mlpdec: move ch_assign setup code down to after ch layout is set.Michael Niedermayer2013-01-23
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mlp: fix channel order.Michael Niedermayer2013-01-23
| | | | | | This fixes a regression introduced with todays merge Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76'Michael Niedermayer2013-01-23
|\ | | | | | | | | | | | | | | | | | | * 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>
| * dsputil: remove one array dimension from avg_no_rnd_pixels_tab.Ronald S. Bultje2013-01-22
| |
* | Merge commit '2612c4dc78e1750c4653bf5a9f2cbe95f7b4ed6e'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | * commit '2612c4dc78e1750c4653bf5a9f2cbe95f7b4ed6e': dsputil: remove 9/10 bits hpel functions. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: remove 9/10 bits hpel functions.Ronald S. Bultje2013-01-22
| | | | | | | | These are never used.
* | Merge commit '2bef1a83d7a3ca60b161ab90bf4d4338e5def5e7'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | * commit '2bef1a83d7a3ca60b161ab90bf4d4338e5def5e7': dsputil: remove some never-assigned function pointers from the struct. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: remove some never-assigned function pointers from the struct.Ronald S. Bultje2013-01-22
| |
* | Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | * commit '32ff6432284f713e9f837ee5b36fc8e9f1902836': dsputil: remove avg_no_rnd_pixels8. Conflicts: libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: remove avg_no_rnd_pixels8.Ronald S. Bultje2013-01-22
| | | | | | | | This is never used.
* | Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Drop DCTELEM typedefDiego Biurrun2013-01-22
| | | | | | | | | | | | It does not help as an abstraction and adds dsputil dependencies. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Merge commit '2e4bb99f4df7052b3e147ee898fcb4013a34d904'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | * commit '2e4bb99f4df7052b3e147ee898fcb4013a34d904': vorbisdsp: convert x86 simd functions from inline asm to yasm. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vorbisdsp: convert x86 simd functions from inline asm to yasm.Ronald S. Bultje2013-01-22
| |
* | Merge commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | * commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a': vp3dsp: don't do aligned reads on input. mlp_parser: cosmetics: re-indent. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vp3dsp: don't do aligned reads on input.Ronald S. Bultje2013-01-22
| | | | | | | | The input is not guaranteed to be aligned.
| * mlp_parser: cosmetics: re-indent.Tim Walker2013-01-22
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | mlpdec: remove disabled code, leftover from mergeMichael Niedermayer2013-01-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ed1b01131e662c9086b27aaaea69684d8575fbea'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | * commit 'ed1b01131e662c9086b27aaaea69684d8575fbea': mlp: implement support for AVCodecContext.request_channel_layout. Conflicts: libavcodec/mlpdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mlp: implement support for AVCodecContext.request_channel_layout.Tim Walker2013-01-22
| | | | | | | | | | | | Also wrap usage of AVCodecContext.request_channels in FF_API_REQUEST_CHANNELS directives. Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | Merge commit 'b0c7e3ffd09f68022429920da483ad7abed84aa1'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | * commit 'b0c7e3ffd09f68022429920da483ad7abed84aa1': mlp_parser: account for AVCodecContext.request_channels when setting the channel layout. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mlp_parser: account for AVCodecContext.request_channels when setting the ↵Tim Walker2013-01-22
| | | | | | | | | | | | | | | | 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>
* | Merge commit '1fd2deedcc6400e08b31566a547a5fac3b38cefb'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | * commit '1fd2deedcc6400e08b31566a547a5fac3b38cefb': mlpdec: set the channel layout. Conflicts: libavcodec/mlpdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mlpdec: set the channel layout.Tim Walker2013-01-22
| | | | | | | | | | | | | | | | Fixes bug 401. Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com> CC:libav-stable@libav.org
* | Merge commit '3ffcccb4fbaae4d5ad775506f1f2761f2029affa'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | * commit '3ffcccb4fbaae4d5ad775506f1f2761f2029affa': mlpdec: TrueHD: use Libav channel order. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mlpdec: TrueHD: use Libav channel order.Tim Walker2013-01-22
| | | | | | | | | | | | | | | | Fixes bug 208. Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com> CC:libav-stable@libav.org
* | Merge commit '99ccd2ba10eac2b282c272ad9e75f082123c765a'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | | | * 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>
| * mlp: store the channel layout for each substream.Tim Walker2013-01-22
| | | | | | | | | | | | | | | | 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
* | Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * arm: Add some missing header #includesDiego Biurrun2013-01-22
| |
| * floatdsp: move scalarproduct_float from dsputil to avfloatdsp.Ronald S. Bultje2013-01-22
| | | | | | | | This makes the aac decoder and all voice codecs independent of dsputil.
* | Merge commit '5959bfaca396ecaf63a8123055f499688b79cae3'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * floatdsp: move butterflies_float from dsputil to avfloatdsp.Ronald S. Bultje2013-01-22
| | | | | | | | | | This makes wmadec/enc, twinvq and mpegaudiodec (i.e. mp2/mp3) independent of dsputil.
* | Merge commit '42d324694883cdf1fff1612ac70fa403692a1ad4'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp.Ronald S. Bultje2013-01-22
| | | | | | | | | | | | 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.
* | Merge commit '55aa03b9f8f11ebb7535424cc0e5635558590f49'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | | | * 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>
| * floatdsp: move vector_fmul_add from dsputil to avfloatdsp.Ronald S. Bultje2013-01-22
| |
* | adcpmenc: remove unused headerPaul B Mahol2013-01-23
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | jpeglsenc: add missing put_bits.h headerPaul B Mahol2013-01-23
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ffv1enc: include correct headerPaul B Mahol2013-01-23
| | | | | | | | | | | | Encoder needs put_bits.h, not get_bits.h Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | dcaenc: remove unused headerPaul B Mahol2013-01-23
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | flacenc: include correct headerPaul B Mahol2013-01-23
| | | | | | | | | | | | Encoder needs put_bits.h, not get_bits.h Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | truemotion2: use av_mallocz()Michael Niedermayer2013-01-23
| | | | | | | | | | | | | | Fixes use of uninitialized values. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | truemotion2: clear the token array if its initialization fails.Michael Niedermayer2013-01-23
| | | | | | | | | | | | | | | | 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>
* | sanm: remove "duplicate" for loop.Michael Niedermayer2013-01-22
| | | | | | | | | | | | | | Fixes input buffer overread Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sanm: check image dimensions before using themMichael Niedermayer2013-01-22
| | | | | | | | | | | | | | Avoids integer overflows and out of array accesses. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lagarith: return more meaningful error codesPaul B Mahol2013-01-22
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Support solid gray frames when decoding Lagarith.Carl Eugen Hoyos2013-01-22
| | | | | | | | Fixes bug 431.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-22
|\| | | | | | | | | | | | | | | * 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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-28 17:18:33 +0000