summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'ae5a8dca675ee544178225256893e679b750cb63'Michael Niedermayer2015-07-23
|\ | | | | | | | | | | | | | | | | | | * commit 'ae5a8dca675ee544178225256893e679b750cb63': hap: Fix slice size computation Conflicts: libavcodec/hapdec.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * hap: Fix slice size computationTom Butterworth2015-07-23
| | | | | | | | | | | | | | | | A bug was introduced in 977105407cae55876041dddbf4ce0934cdd4cd6c whereby when frame height wasn't divisible by the number of threads, pixels would be omitted from the bottom rows during decode. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'ebe8b5d947c41449c684f17c6826fe6bc46c0360'Michael Niedermayer2015-07-23
|\| | | | | | | | | | | | | * commit 'ebe8b5d947c41449c684f17c6826fe6bc46c0360': dds: Fix the slice size computation Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * dds: Fix the slice size computationTom Butterworth2015-07-23
| | | | | | | | | | | | | | | | A bug was introduced in 6b2b26e7af3ede0abfb46eb5725c26d1083f50bc whereby when frame height wasn't divisible by the number of threads, pixels would be omitted from the bottom rows during decode. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4'Michael Niedermayer2015-07-23
|\| | | | | | | | | | | | | | | | | | | | | * commit '22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4': af_channelmap: properly set the supported output channel layouts Conflicts: libavfilter/af_channelmap.c See: 39867f3e098ab304cd3bef0ace19d73617cdb817 Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * af_channelmap: properly set the supported output channel layoutsAnton Khirnov2015-07-23
| | | | | | | | | | | | | | | | | | | | The current code expects query_formats() to be called exactly once, it will leak if it's not called at all (filter initialized, but never configured or used) or try to read freed memory if it's called more than once. Found-by: James Almer <jamrial@gmail.com> CC: libav-stable@libav.org
* | Merge commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6'Michael Niedermayer2015-07-23
|\| | | | | | | | | | | | | * commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6': asfdec: increment nb_streams right after the stream allocation Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * asfdec: increment nb_streams right after the stream allocationAlexandra Hájková2015-07-23
| | | | | | | | | | | | to prevent possible memory leaks Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'ee80f834cbb6dbacdc1efb4c658a7d775e82ebff'Michael Niedermayer2015-07-23
|\| | | | | | | | | | | | | * commit 'ee80f834cbb6dbacdc1efb4c658a7d775e82ebff': asfdec: set nb_streams to 0 in the asf_read_close Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * asfdec: set nb_streams to 0 in the asf_read_closeAlexandra Hájková2015-07-23
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avutil/softfloat: move av_sincos_sf() back to headerJames Almer2015-07-22
| | | | | | | | | | | | | | Fixes compilation of host tool aacps_fixed_tablegen Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* | libavcodec/qsvdec_h264.c: SPS parsing is now performed by ↵Ivan Uskov2015-07-23
| | | | | | | | | | | | MFXVideoDECODE_DecodeHeader() in libavcodec/qsvdec.c Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | tests/checkasm/h264pred: Use LOCAL_ALIGNED_16()Michael Niedermayer2015-07-23
| | | | | | | | | | | | Fixes alignment issue and bus errors Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | tests/checkasm/h264qpel: Use LOCAL_ALIGNED_16()Michael Niedermayer2015-07-23
| | | | | | | | | | | | Fixes alignment issue and bus errors Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Edit documentation and versioning for the fixed point AAC decoderJovan Zelincevic2015-07-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec: Minor macro polishingNedeljko Babic2015-07-22
| | | | | | | | | | | | | | | | Use macros from aac_defines.h for adding suffixes instead of local macros. Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate: Make ffprobe tests depend on avdeviceMichael Niedermayer2015-07-22
| | | | | | | | | | | | | | | | | | The test file they use needs avdevice to be created Probably fixes Ticket 4455 Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | tests: Add aac_fixed decoder testNedeljko Babic2015-07-22
| | | | | | | | | | Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec: Implementation of AAC_fixed_decoder (PS-module)Djordje Pesut2015-07-22
| | | | | | | | | | | | | | Add fixed point implementation. Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec: Table creation for AAC_fixed_decoder (PS-module)Jovan Zelincevic2015-07-22
| | | | | | | | | | | | | | Add fixed point implementation of functions for generating tables. Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec: remove unused sd variablesMichael Niedermayer2015-07-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/dump: Also print pict_type in dump_sidedata() for ↵Michael Niedermayer2015-07-22
| | | | | | | | | | | | AV_PKT_DATA_QUALITY_STATS Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/libx264: Export choosen pict_typeMichael Niedermayer2015-07-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/dnxhdenc: Set pict type for AV_PKT_DATA_QUALITY_STATS correctlyMichael Niedermayer2015-07-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/libxavs: Export pict_type in side dataMichael Niedermayer2015-07-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Replace AV_PKT_DATA_QUALITY_FACTOR by AV_PKT_DATA_QUALITY_STATSMichael Niedermayer2015-07-22
| | | | | | | | | | | | | | | | | | The stats are a superset of the quality factor, also allowing the picture type and encoder "PSNR" stats to be exported This also replaces the native by fixed little endian order for the affected side data AV_PKT_DATA_QUALITY_FACTOR is left as a synonym of AV_PKT_DATA_QUALITY_STATS Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | apng: Fix decoding images with the PREVIOUS dispose opDonny Yang2015-07-22
| |
* | Merge commit '21c90d86d27c2143354c7d782050a779b0986eb1'Michael Niedermayer2015-07-22
|\| | | | | | | | | | | | | * commit '21c90d86d27c2143354c7d782050a779b0986eb1': mpegvideo: Add missing include Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * mpegvideo: Add missing includeVittorio Giovara2015-07-22
| |
* | Merge commit 'a16854892c3af945d3ab0015699a0c9884f0a89a'Michael Niedermayer2015-07-22
|\| | | | | | | | | | | | | * commit 'a16854892c3af945d3ab0015699a0c9884f0a89a': dds: Add a rgba fate test Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * dds: Add a rgba fate testVittorio Giovara2015-07-22
| |
* | avfilter: add deband filterPaul B Mahol2015-07-22
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'd08d8b61aa9f07d3ea993fe5392f7408c958d221'Michael Niedermayer2015-07-22
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd08d8b61aa9f07d3ea993fe5392f7408c958d221': dds: Fix 32bpp bitmaps decoding Conflicts: libavcodec/dds.c See: 5c583b141980102530c75d2756b06766742532a1 Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * dds: Fix 32bpp bitmaps decodingMichael Niedermayer2015-07-22
| | | | | | | | | | Found-By: ami_stuff Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '57214b2f7f9b1ccfd61e232e8989b5ee850f169c'Michael Niedermayer2015-07-22
|\| | | | | | | | | | | | | | | | | | | | | * commit '57214b2f7f9b1ccfd61e232e8989b5ee850f169c': dds: Fix palette decoding Conflicts: libavcodec/dds.c See: 36a87c2dc7f302da3778bd0cff050b5c93a730c7 Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * dds: Fix palette decodingVittorio Giovara2015-07-22
| | | | | | | | | | | | Red and blue channels were decoded in the wrong order. Found-By: ami_stuff
* | Merge commit 'ea4d46e72945cba37feb7aa154eb970732f513e4'Michael Niedermayer2015-07-22
|\| | | | | | | | | | | | | * commit 'ea4d46e72945cba37feb7aa154eb970732f513e4': dds: Fix enum declaration Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * dds: Fix enum declarationVittorio Giovara2015-07-22
| | | | | | | | Drop the global variables with anonymous enum type.
* | Merge commit '2a187a074a7f5ad9f01f72ac9715ddfcb2dbb8ec'Michael Niedermayer2015-07-22
|\| | | | | | | | | | | | | * commit '2a187a074a7f5ad9f01f72ac9715ddfcb2dbb8ec': asfdec: avoid crash in the case when chunk_len is 0 or pkt_len is 0 Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * asfdec: avoid crash in the case when chunk_len is 0 or pkt_len is 0Alexandra Hájková2015-07-22
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd'Michael Niedermayer2015-07-22
|\| | | | | | | | | | | | | * commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd': asfdec: close the demuxer properly when read_header is failing Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * asfdec: close the demuxer properly when read_header is failingAlexandra Hájková2015-07-22
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '5655236a67203d923755f285584c6e68abe7e33f'Michael Niedermayer2015-07-22
|\| | | | | | | | | | | | | * commit '5655236a67203d923755f285584c6e68abe7e33f': asfdec: factor out seeking to the Data Object outside while Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * asfdec: factor out seeking to the Data Object outside whileAlexandra Hájková2015-07-22
| | | | | | | | | | | | return INVALIDDARA if Data Object was not found Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c'Michael Niedermayer2015-07-22
|\| | | | | | | | | | | | | * commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c': qsvenc_hevc: use the correct HW plugin UID Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * qsvenc_hevc: use the correct HW plugin UIDAnton Khirnov2015-07-22
| |
* | Merge commit 'e605bf3b590d295f215fcc9fd58eb11be55b68cb'Michael Niedermayer2015-07-22
|\| | | | | | | | | | | | | * commit 'e605bf3b590d295f215fcc9fd58eb11be55b68cb': checkasm: remove empty array initializer list in h264pred test Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * checkasm: remove empty array initializer list in h264pred testJanne Grunau2015-07-22
| | | | | | | | Fixes MSVC compilation.
* | Merge commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5'Michael Niedermayer2015-07-22
|\| | | | | | | | | | | | | * commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5': checkasm: Always link statically Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * checkasm: Always link staticallyLuca Barbato2015-07-21
| | | | | | | | Checkasm needs to use internal symbols that should not be made public.