summaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* x86/dsputil: add emms to ff_scalarproduct_int16_mmxext()James Almer2014-03-062-3/+3
| | | | | | | | Also undo the changes to ra144enc.c from previous commits. Should fix ticket #3429 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libx265: Use ctx->vui. instead of ctx-> for some options A recent change in ↵sfan52014-03-061-5/+5
| | | | | | | libx265 moved some options such as sar_width into a 'vui' struct. Signed-off-by: sfan5 <sfan5@live.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '3bfdee00cd92ff07c364d4901c4aefda32780756'Michael Niedermayer2014-03-061-2/+2
|\ | | | | | | | | | | | | | | | | | | | | * commit '3bfdee00cd92ff07c364d4901c4aefda32780756': x86: dcadsp: Fix linking with yasm and optimizations disabled Conflicts: libavcodec/x86/dcadsp_init.c See: 206167a295a5c28cec3c38f7308835b0b7e0618f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: dcadsp: Fix linking with yasm and optimizations disabledDiego Biurrun2014-03-051-0/+4
| | | | | | | | | | Some optimized functions reference optimized symbols, so the functions must be explicitly disabled when those symbols are unavailable.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-051-8/+12
|\ \ | |/ | | | | | | | | | | * qatar/master: arm: hpeldsp: prevent overreads in armv6 asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: hpeldsp: prevent overreads in armv6 asmJanne Grunau2014-03-051-8/+12
| | | | | | | | | | | | | | Based on a patch by Russel King <rmk+libav@arm.linux.org.uk> Bug-Id: 646 CC: libav-stable@libav.org
* | Merge commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d'Michael Niedermayer2014-03-051-1/+1
|\ \ | |/ | | | | | | | | | | * commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d': x86: cabac: Use correct #includes to make header compile standalone Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: cabac: Use correct #includes to make header compile standaloneDiego Biurrun2014-03-051-1/+1
| |
* | avcodec/ra144enc: avoid calling emms when the SSE2 version is usedMichael Niedermayer2014-03-051-2/+3
| | | | | | | | | | | | emms is a rather slow operation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ra144enc: fix use of scalarprod_int16Christophe Gisquet2014-03-051-0/+1
| | | | | | | | | | | | | | | | | | | | c3390fd56cf55259ea7665ecea6c8aeddf56e2fc made use of the DSP function but did not complement it with a call to emms, which is done here before computations involving floats are performed. Fixes ticket #3429, which affected MMX/MMXExt machines. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c'Michael Niedermayer2014-03-051-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c': av_vdpau_get_profile: mask out H.264 intra profile flag Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * av_vdpau_get_profile: mask out H.264 intra profile flagRémi Denis-Courmont2014-03-041-1/+1
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | x86/synth_filter: add synth_filter_fma3James Almer2014-03-052-17/+15
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/synth_filter: add missing HAVE_YASM guardJames Almer2014-03-041-0/+4
| | | | | | | | | | | | | | Should fix compilation failures with --disable-yasm on some compilers Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-0410-13/+21
|\ \ | |/ | | | | | | | | | | | | | | | | * qatar/master: put_bits: Remove unused includes Conflicts: libavcodec/put_bits.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * put_bits: Remove unused includesVittorio Giovara2014-03-048-13/+19
| | | | | | | | | | This requires adding includes to other files that relied on these being included implicitly.
* | Merge commit '5397386effba2e53e4ff82852a86f6be4d59e9c1'Michael Niedermayer2014-03-041-9/+0
|\ \ | |/ | | | | | | | | | | * commit '5397386effba2e53e4ff82852a86f6be4d59e9c1': mathops: move macro to the only place it is used Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mathops: move macro to the only place it is usedVittorio Giovara2014-03-041-9/+0
| | | | | | | | This helps in disentangling lavf and lavc too.
| * ituh263: reject b-frame with pp_time = 0Keiji Costantini2014-03-011-0/+2
| | | | | | | | | | | | | | | | | | Avoid a division by 0 in ff_mpeg4_set_one_direct_mv. Sample-Id: 00000168-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec/h263dec: Workaround H263 end padding bugMichael Niedermayer2014-03-041-0/+11
| | | | | | | | | | | | Fixes: H263PaddingBugFixVID_6647.MOV Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libutvideoenc: Add support for the new BT.709 FourCCs for YCbCrJan Ekström2014-03-031-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | With cli usage the decoder might have not set the colorspace during encoder init, manual colorspace override might be needed in such cases. Signed-off-by: Anton Khirnov <anton@khirnov.net> This applies commit 5de64bb3 (the source of the above commit message) to libutvideoenc as well. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/hevcpred_template: also initialize top[-1] for constrained intra ↵Michael Niedermayer2014-03-021-0/+1
| | | | | | | | | | | | | | | | | | prediction Fixes out of array read Fixes: 387713a12dc5cfa27fcb4178084ce1ea-asan_stack-oob_131176a_1182_cov_3861068719_CAINIT_C_SHARP_3.bit Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/g2meet: also reset local got_header when reseting the context got_headerMichael Niedermayer2014-03-021-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/g2meet: fix error returnsMichael Niedermayer2014-03-021-4/+8
| | | | | | | | | | | | | | | | | | | | Fixes out of array accesses This should not affect any release Fixes: 8ab69af9e5a7a7e20fe04cdd25c0d6e7-asan_heap-oob_e72b82_5505_cov_2278389485_g2m4.wmv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/synth_filter: Revert the switch to float ops with SSE2James Almer2014-03-021-4/+17
| | | | | | | | | | | | | | | | | | This reverts the changes 64672098361361cd15d37e36f747ab44de5b80ca and 68c3ed936a76c3ff7738f602fa90237ac7e3ce08 did to the SSE2 version, which generated a hit of about 5 cycles. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/synth_filter: add synth_filter_avxJames Almer2014-03-022-34/+49
| | | | | | | | | | | | | | | | | | Sandy Bridge Win64: 180 cycles on ff_synth_filter_inner_sse2 150 cycles on ff_synth_filter_inner_avx Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/synth_filter: add synth_filter_sseJames Almer2014-03-012-29/+57
| | | | | | | | | | | | | | Build only on x86_32 targets. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd1f9563d502037239185c11578cc614bdf0c5870'Michael Niedermayer2014-03-011-2/+3
|\ \ | |/ | | | | | | | | | | * commit 'd1f9563d502037239185c11578cc614bdf0c5870': pthread_frame: flush all threads on flush, not just the first one Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pthread_frame: flush all threads on flush, not just the first oneAnton Khirnov2014-02-281-2/+3
| | | | | | | | | | | | | | | | | | avcodec_flush_buffers() must release all internally held references according to its documentation, for which all the threads need to be flushed. CC:libav-stable@libav.org Bug-Id: vlc/9665
* | Merge commit '2f02bbcca050936686482453078e83dc25493da0'Michael Niedermayer2014-03-013-6/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '2f02bbcca050936686482453078e83dc25493da0': build: Let the ffvhuff decoder/encoder depend on the huffyuv decoder/encoder Conflicts: configure libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Let the ffvhuff decoder/encoder depend on the huffyuv decoder/encoderDiego Biurrun2014-02-283-6/+0
| | | | | | | | | | Almost all of the code is shared so there is little point in enabling one decoder/encoder without the other.
* | Merge commit '34150be515cd9c43b0b679806b8d01774960af78'Michael Niedermayer2014-03-011-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '34150be515cd9c43b0b679806b8d01774960af78': build: Let the iac decoder depend on the imc decoder Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Let the iac decoder depend on the imc decoderDiego Biurrun2014-02-281-1/+0
| | | | | | | | | | Almost all of the code is shared so there is little point in enabling one decoder without the other.
* | Merge commit '8e0cf39faf02536dca08f4fe628a66d1ae022fde'Michael Niedermayer2014-03-011-6/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '8e0cf39faf02536dca08f4fe628a66d1ae022fde': build: Let all MJPEG-related decoders depend on the MJPEG decoder Conflicts: configure libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Let all MJPEG-related decoders depend on the MJPEG decoderDiego Biurrun2014-02-281-6/+4
| | | | | | | | | | | | These codecs compile all of the MJPEG code anyway, so there is little point in not enabling the MJPEG decoder directly. This also simplifies the dependency declarations for the MJPEG codec family.
* | Merge commit '0a36988e48dd581d29e77f768f987738bdf365f0'Michael Niedermayer2014-03-011-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '0a36988e48dd581d29e77f768f987738bdf365f0': build: Let AMV decoder depend on the SP5X decoder Conflicts: configure libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Let AMV decoder depend on the SP5X decoderDiego Biurrun2014-02-281-1/+0
| | | | | | | | | | | | This codec compiles all of the SP5X code anyway, so there is little point in not enabling the decoder directly. This also simplifies the dependency declaration for the AMV decoder.
* | Merge commit 'f4bd9fe326ad1315a74206939ae56df93b940a09'Michael Niedermayer2014-03-011-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'f4bd9fe326ad1315a74206939ae56df93b940a09': h264: fix clang warning about uninitialized variable Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: fix clang warning about uninitialized variableVittorio Giovara2014-02-281-1/+1
| |
* | Merge commit '17a63ff0cd187b9e50e4a47862750295976853b1'Michael Niedermayer2014-03-011-6/+7
|\ \ | |/ | | | | | | | | | | * commit '17a63ff0cd187b9e50e4a47862750295976853b1': h264: update flag name in ff_h264_decode_ref_pic_list_reordering() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: update flag name in ff_h264_decode_ref_pic_list_reordering()Vittorio Giovara2014-02-281-6/+7
| | | | | | | | This is the name used in the specifications.
* | Merge commit 'ee6280ca12696a67535ce2245c77190edc513794'Michael Niedermayer2014-03-011-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'ee6280ca12696a67535ce2245c77190edc513794': h264: parse two additional constraint flags Conflicts: libavcodec/h264_ps.c See: 9091ba9dfa0901bdce8305cf282c747b0f4c942e Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: parse two additional constraint flagsVittorio Giovara2014-02-281-1/+3
| |
* | Merge commit 'e70ab7c1f5005041bba0e4efc1165410f83495b2'Michael Niedermayer2014-03-011-5/+11
|\ \ | |/ | | | | | | | | | | * commit 'e70ab7c1f5005041bba0e4efc1165410f83495b2': h264: add MVCD to the list of High profiles in SPS Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: add MVCD to the list of High profiles in SPSVittorio Giovara2014-02-281-5/+11
| | | | | | | | Also comment all previous profiles.
| * latm: Always reconfigure if no extradata was set previouslyHendrik Leppkes2014-02-281-1/+2
| | | | | | | | | | | | | | | | | | | | AAC LOAS can have new audio config objects in the stream itself. Make sure the decoder reconfigures itself when the first one arrives midstream. Bug-Id: 644 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avcodec/utvideoenc: fix slice_bits sizeMichael Niedermayer2014-03-011-2/+2
| | | | | | | | | | | | Fixes assertion failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ac3_parser: add avpriv_ac3_parse_header2() and use it in libavcodecMichael Niedermayer2014-03-013-6/+25
| | | | | | | | | | | | | | The new function has the ability to allocate the structure, allowing it to grow without needing major bumps Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ac3: move new field to the end of AC3HeaderInfoMichael Niedermayer2014-03-011-0/+5
| | | | | | | | | | | | | | This structure is used in the interface between libs and thus cannot have fields added in the middle without major bump Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '6e4009d4cdf5927bdaedf58fcfc5e813b14c366b'Michael Niedermayer2014-02-282-0/+36
|\ \ | |/ | | | | | | | | | | * commit '6e4009d4cdf5927bdaedf58fcfc5e813b14c366b': arm: dcadsp: implement decode_hf as external NEON asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud