aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* swscale/x86/swscale: fix missing xmm clobbers in yuv2yuvX_sse3()Michael Niedermayer2014-03-151-1/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: Check ist is valid before using it in audio_channels_map initMichael Niedermayer2014-03-151-7/+19
| | | | | | | Fixes segfault and instead provides an error message Fixes Ticket3465 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/mpegvideo_enc: dont use direct mode for unaligned inputMichael Niedermayer2014-03-151-0/+4
| | | | | | Fixes Ticket3456 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec: Move STRIDE_ALIGN to internal.hMichael Niedermayer2014-03-152-6/+6
| | | | | | The next commit/bugfix will need it Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/id3v2: decode compilation metadataPeter Ross2014-03-151-0/+2
| | | | | | | Described http://id3.org/iTunes%20Compilation%20Flag Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/movenc: encode compilation metadataPeter Ross2014-03-151-0/+1
| | | | | | | Fixes ticket #2960. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mov: decode compilation metadataPeter Ross2014-03-151-0/+2
| | | | | | | This flag is known as 'Part of a compilation' in Apple iTunes. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/adpcm: ADPCM_IMA_DK3 packets are padded to 16-bit packet boundaryPeter Ross2014-03-151-0/+3
| | | | | | | Fixes ticket #3461. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/arm/cabac: fix inline cabac reader with the UNCHECKED bitstream readerMichael Niedermayer2014-03-152-1/+7
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/h264_cabac: move the arm unchecked_bitstream reader special case ↵Michael Niedermayer2014-03-151-2/+2
| | | | | | closer to where the issue is Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/h264_cabac: disable the unchecked bitstream reader for arm & aarch64Michael Niedermayer2014-03-151-1/+1
| | | | | | The newly added optimizations do not work with the unchecked reader Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avfilter: make avfilter_graph_get_filter use const string nameYu Xiaolei2014-03-142-2/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* configure: factorize mips arch extensions outMichael Niedermayer2014-03-141-4/+8
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* configure: remove unused identifer that was added by cleanupsMichael Niedermayer2014-03-141-1/+0
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-141-170/+172
|\ | | | | | | | | | | | | | | | | | | * qatar/master: codec_desc: group image codecs together Conflicts: libavcodec/codec_desc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * codec_desc: group image codecs togetherVittorio Giovara2014-03-141-170/+172
| |
* | Merge commit 'd42ea06798b83d87397449ec6aad40cb5ea46e43'Michael Niedermayer2014-03-141-0/+2
|\| | | | | | | | | | | | | * commit 'd42ea06798b83d87397449ec6aad40cb5ea46e43': codec_desc: add missing .long_name Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * codec_desc: add missing .long_nameVittorio Giovara2014-03-141-0/+4
| |
* | Merge commit '999d31d354f1f0616a09691913659ac0abdcc899'Michael Niedermayer2014-03-141-4/+3
|\| | | | | | | | | | | | | * commit '999d31d354f1f0616a09691913659ac0abdcc899': codec_desc: K&R formatting cosmetics Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * codec_desc: K&R formatting cosmeticsVittorio Giovara2014-03-141-4/+3
| |
* | Merge commit '7a650caf6436ddfe417bdcb5ce520c96c779af7b'Michael Niedermayer2014-03-141-97/+125
|\| | | | | | | | | | | | | | | | | | | * commit '7a650caf6436ddfe417bdcb5ce520c96c779af7b': configure: Split some logical blocks off from HAVE_LIST Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Split some logical blocks off from HAVE_LISTDiego Biurrun2014-03-141-84/+112
| |
* | Merge commit 'd0adf55c05beaf80420747dded2d1884bff377ec'Michael Niedermayer2014-03-141-23/+35
|\| | | | | | | | | | | | | | | | | | | * commit 'd0adf55c05beaf80420747dded2d1884bff377ec': configure: Split some logical blocks off from CONFIG_LIST Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Split some logical blocks off from CONFIG_LISTDiego Biurrun2014-03-141-21/+33
| |
* | Merge commit '07ea8a7e943ea6a7bdcd736e2fc3ed357dc15c57'Michael Niedermayer2014-03-141-25/+33
|\| | | | | | | | | | | | | | | | | | | * commit '07ea8a7e943ea6a7bdcd736e2fc3ed357dc15c57': configure: Group and sort function/struct/type checks Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Group and sort function/struct/type checksDiego Biurrun2014-03-141-23/+31
| | | | | | | | | | Group checks into logical groups and sort alphabetically within those groups unless checks have close coupling. Keep closely coupled checks together.
* | Merge commit '36b822b8be7f9ecd6f9d87acaa786b128a873cd9'Michael Niedermayer2014-03-141-2/+1
|\| | | | | | | | | | | | | * commit '36b822b8be7f9ecd6f9d87acaa786b128a873cd9': arm: dsputil: Drop restrict keyword from add_pixels_clamped_armv6 prototype Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: dsputil: Drop restrict keyword from add_pixels_clamped_armv6 prototypeDiego Biurrun2014-03-141-2/+1
| | | | | | | | | | | | | | | | The function is assigned to a function pointer that does not have the restrict keyword for that parameter. This fixes compilation for MSVC builds that don't recognize "restrict", broken since ed9625eb62.
* | configure: add missing avx2 support checkJames Almer2014-03-141-0/+1
| | | | | | | | | | | | | | | | AVX2 support was introduced in Yasm 1.2.0, and some distros like Debian still feature version 1.1.0 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/adpcm: squelch 'mismatch in coded sample count' warning for ↵Peter Ross2014-03-141-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | AV_CODEC_ID_ADPCM_EA_R2/3 These ADPCM codecs include a per-frame flag that enables a raw 16-bit mode. Therefore the the number of samples returned by get_nb_samples() is only ever approximate. Fixes ticket #3460. Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/arm/fft_fixed_neon: reduce diff by 2 spaces to libavMichael Niedermayer2014-03-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-141-22/+28
|\| | | | | | | | | | | | | | | | | | | * qatar/master: aac: K&R formatting cosmetics Conflicts: libavformat/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aac: K&R formatting cosmeticsLuca Barbato2014-03-141-23/+28
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '2e708f17083fc41f10161f2406d57ec154c75468'Michael Niedermayer2014-03-140-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '2e708f17083fc41f10161f2406d57ec154c75468': ljpeg: fix duplicated pixel format entry Conflicts: libavcodec/ljpegenc.c No change as there was no duplicate entry in ffmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ljpeg: fix duplicated pixel format entryVittorio Giovara2014-03-131-1/+1
| |
* | avcodec/libx265: fill headers in extradataMichael Niedermayer2014-03-141-1/+8
| | | | | | | | | | | | Fixes Ticket3457 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'eb2b8bce39c93d16a02656238248c6cf697f447f'Michael Niedermayer2014-03-148-11/+10
|\| | | | | | | | | | | | | | | | | | | * commit 'eb2b8bce39c93d16a02656238248c6cf697f447f': bfin: Use more sensible file names Conflicts: libavcodec/bfin/pixels.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bfin: Use more sensible file namesDiego Biurrun2014-03-138-10/+10
| | | | | | | | | | Drop non-informative _bfin suffix, rename some files for consistency with other architectures, rename others to reflect their content.
* | Merge commit '929ec39ec4497827f7530f2aaa31646ef35462ee'Michael Niedermayer2014-03-143-64/+82
|\| | | | | | | | | | | | | * commit '929ec39ec4497827f7530f2aaa31646ef35462ee': bfin: hpeldsp: Split no_rnd pixel operations off into a separate file Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bfin: hpeldsp: Split no_rnd pixel operations off into a separate fileDiego Biurrun2014-03-133-64/+82
| | | | | | | | This saves some space in configurations that do not enable hpeldsp.
* | Merge commit 'a7cc4ac9d99bd586c8939f4312f8c9e56d5f5730'Michael Niedermayer2014-03-141-2/+2
|\| | | | | | | | | | | | | * commit 'a7cc4ac9d99bd586c8939f4312f8c9e56d5f5730': bfin: dsputil: Unconditionally compile hpel pixels code Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bfin: dsputil: Unconditionally compile hpel pixels codeDiego Biurrun2014-03-131-2/+2
| | | | | | | | The functions it contains are used from unconditionally compiled code.
* | Merge commit '13ae97b210f35d77290f4edb0d6846269271729a'Michael Niedermayer2014-03-142-34/+34
|\| | | | | | | | | | | | | * commit '13ae97b210f35d77290f4edb0d6846269271729a': bfin: hpeldsp: "nornd" ---> "no_rnd" function name suffix for consistency Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bfin: hpeldsp: "nornd" ---> "no_rnd" function name suffix for consistencyDiego Biurrun2014-03-132-34/+34
| |
* | Merge commit 'bbf0ef57e9d2d7bb2995f664dd74c8229bca25f5'Michael Niedermayer2014-03-146-95/+43
|\| | | | | | | | | | | | | | | | | | | | | * commit 'bbf0ef57e9d2d7bb2995f664dd74c8229bca25f5': bfin: Move all assembly declarations only used within one .c file there Conflicts: libavcodec/bfin/dsputil_bfin.h libavcodec/bfin/vp3_bfin.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bfin: Move all assembly declarations only used within one .c file thereDiego Biurrun2014-03-136-95/+43
| | | | | | | | This is done similarly for all other architectures.
* | Merge commit '80173c71bab3b8817c148837bdc920557018f428'Michael Niedermayer2014-03-142-35/+62
|\| | | | | | | | | | | | | * commit '80173c71bab3b8817c148837bdc920557018f428': bfin: hpeldsp: K&R formatting cosmetics Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bfin: hpeldsp: K&R formatting cosmeticsDiego Biurrun2014-03-132-35/+62
| |
* | Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87'Michael Niedermayer2014-03-147-69/+26
|\| | | | | | | | | | | | | | | | | | | * commit 'da785231ea0b82b5c2526babbb2871c935b21a87': bfin: Refactor duplicated assembly-related macros Conflicts: libavcodec/bfin/hpel_pixels_bfin.S Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bfin: Refactor duplicated assembly-related macrosDiego Biurrun2014-03-137-69/+25
| |