aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * asf: Do not skip data streamsLuca Barbato2015-06-281-6/+0
| |
* | Rename asfdec-o.c to asfdec_o.cMichael Niedermayer2015-06-302-1/+1
| | | | | | | | | | | | Most files use _ instead of - as spacer, so this is more consistent Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: rename asfdec.c to asfdec_f.cMichael Niedermayer2015-06-302-2/+2
| | | | | | | | | | | | leaving it as asfdec.c confuses git Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: fix hevc_vdpau_hwaccel dependenciesJames Almer2015-06-301-1/+1
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec/h264_refs: discard mismatching referencesMichael Niedermayer2015-06-301-0/+16
| | | | | | | | | | | | | | | | Fixes inconsistency and out of array access Fixes: asan_heap-oob_17301a3_2100_cov_3226131691_ff_add_pixels_clamped_mmx.m2ts Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Fix small picture upscaleMichael Niedermayer2015-06-301-4/+6
| | | | | | | | | | | | | | | | | | Fixes out of array access Fixes: asan_heap-oob_1dd60fd_267_cov_2954683513_5baad44ca4702949724234e35c5bb341.jpg Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pngdec: Check values before updating context in decode_fctl_chunk()Michael Niedermayer2015-06-291-13/+21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pngdec: Copy IHDR & plte state from last threadMichael Niedermayer2015-06-291-8/+15
| | | | | | | | | | | | | | | | | | | | Previously these chunks where parsed again for each frame with threads but not without leading to a different path and the potential for inconsistencies This also removes a related special case from decode_ihdr_chunk() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pngdec: Require a IHDR chunk before fctlMichael Niedermayer2015-06-291-0/+5
| | | | | | | | | | | | This is required by the APNG spec Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pngdec: Only allow one IHDR chunkMichael Niedermayer2015-06-291-0/+5
| | | | | | | | | | | | | | | | | | | | Multiple IHDR chunks are forbidden in PNG Fixes inconsistency and out of array accesses Fixes: asan_heap-oob_4d5c5a_1738_cov_2638287726_c-m2-8f2b481b7fd9bd745e620b7c01a18df2.png Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/avf_showvolume: optionally display channel namesPaul B Mahol2015-06-292-0/+33
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2015-06-298-10/+32
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cehoyos/master: lavf/msnwc: Return 0 if the probe function does not detect msnwc-tcp. lavf/mpegts: Return 0 if the probe function does not detect mpegts. lavf/img2dec: Improve detection of valid Quickdraw images. lavf/asfdec: Reduce minimum header size. Changelog: Add jpeg 2000 improvements before they get forgotten. lavf/img2dec: Autodetect dds frames. Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavf/msnwc: Return 0 if the probe function does not detect msnwc-tcp.Carl Eugen Hoyos2015-06-291-1/+1
| | | | | | | | | | | | Reduces console spamming on debug level.
| * | lavf/mpegts: Return 0 if the probe function does not detect mpegts.Carl Eugen Hoyos2015-06-291-2/+2
| | | | | | | | | | | | Reduces console spamming on debug level.
| * | lavf/img2dec: Improve detection of valid Quickdraw images.Carl Eugen Hoyos2015-06-291-3/+9
| | | | | | | | | | | | | | | Detect Quickdraw images without application header with lower score.
| * | lavf/asfdec: Reduce minimum header size.Carl Eugen Hoyos2015-06-291-2/+3
| | | | | | | | | | | | Fixes GipsyGuitar.wmv mentioned in ticket #1477.
| * | Changelog: Add jpeg 2000 improvements before they get forgotten.Carl Eugen Hoyos2015-06-291-0/+1
| | |
| * | lavf/img2dec: Autodetect dds frames.Carl Eugen Hoyos2015-06-294-1/+15
| | |
* | | aacenc: add support for coding of intensity stereo scalefactor indicesRostislav Pehlivanov2015-06-292-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds support for the coding of intensity stereo scalefactor indices. It does not do any marking of such bands and as such does no functional changes to the encoder. It removes any old twoloop specific code for PNS and moves it into a seperate function which handles setting of scalefactor indices for PNS and IS bands. Reviewed-by: Claudio Freire <klaussfreire@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/avio: Move avio_delete() avio_move() to avpriv_ namespaceMichael Niedermayer2015-06-294-9/+5
|/ / | | | | | | | | | | | | | | | | This was suggested in the discussion about these functions With this change the functions are available internally but are not part of the public API Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale/swscale_unscaled: Fix rounding difference with RGBA output between ↵Michael Niedermayer2015-06-292-1/+6
| | | | | | | | | | | | | | | | little and big endian Fixes fate/dds-rgb16 on big endian Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for pixblock functionsShivraj Patil2015-06-297-0/+243
| | | | | | | | | | | | | | | | This patch adds MSA (MIPS-SIMD-Arch) optimizations for pixblock functions in new file pixblockdsp_msa.c Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/filters: fix documentation bug in ssim filterPaul B Mahol2015-06-281-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/asfdec: Allow packet_obj_size == 0Michael Niedermayer2015-06-291-1/+1
| | | | | | | | | | | | Fixes Ticket3521 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec: Print packet_obj_size in case it is invalidMichael Niedermayer2015-06-291-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | api-h264-test: build with another api testLudmila Glinskih2015-06-295-6/+9
| | | | | | | | | | | | Location of api-h264-test changed to special directory for api tests. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate/api-tests: Added dependency on $(FF_DEP_LIBS)George Boyle2015-06-291-1/+1
| | | | | | | | | | | | This ensures they are built before the tests are run. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tests/Makefile: Fix missing trailing slash for API tests dir targetGeorge Boyle2015-06-281-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec: Print a warning if data is skiped due to less than a frame ↵Michael Niedermayer2015-06-281-0/+3
| | | | | | | | | | | | header being left Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec: Reduce FRAME_HEADER_SIZE to 11Michael Niedermayer2015-06-281-1/+1
| | | | | | | | | | | | This fixes demuxing of screen_codec.wmv Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aaccoder: add intensity stereo support to encode_window_bands_info quantizerRostislav Pehlivanov2015-06-281-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds support for both PNS and IS (intensity stereo) codebooks to the encode_window_bands_info() quantizer, used by the faast, faac and anmr non-default, native coders. This does not mean that both extensions now work with those coders, some are simply unsuited and will trigger an assertion in the encoder while others simply ignore the changed scalefactor indices and band types. This commit simply adds support for encoding said band types with the alternative coders. Future commits to the coders will be required to make them suitable. Reviewed-by: Claudio Freire <klaussfreire@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aaccoder: add intensity stereo coding support for the trellis quantizerRostislav Pehlivanov2015-06-281-35/+34
| | | | | | | | | | | | | | | | This commit extends the trellis quantizer (used by the default twoloop coder) to accept and correctly encode codebooks needed for intensity stereo and perceptual noise substitution. Reviewed-by: Claudio Freire <klaussfreire@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: Remove unused variablesMichael Niedermayer2015-06-281-2/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wmavoice: limit wmavoice_decode_packet return value to packet sizeAndreas Cadhalpun2015-06-281-2/+16
| | | | | | | | | | | | | | Claiming to have decoded more bytes than the packet size is wrong. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | lavc/adpcm: THP: set approx_nb_samples correctlyRodger Combs2015-06-281-4/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: add showvolume filterPaul B Mahol2015-06-286-1/+267
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/jpeg2000dec: Merge i_stepsize/2 decoder special case into dequantMichael Niedermayer2015-06-287-11/+12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | huffyuvdec: validate image sizeAndreas Cadhalpun2015-06-281-0/+5
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | aacpsy: Add energy spread for each bandRostislav Pehlivanov2015-06-282-2/+2
| | | | | | | | | | | | | | | | | | | | This commit adds the energy spread to the struct for each band and removes 2 unused fields. distortion and perceptual_weight were not referenced in any file nor were they set to any value, so it was safe to remove them. The energy spread is currently only used in the aac psy model. It's defined as being proportional to the tonality of each band. Reviewed-by: Claudio Freire <klaussfreire@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8a26ae5f94e613dbf7eb8e3c60462e966e409cdc'Michael Niedermayer2015-06-281-0/+2
|\| | | | | | | | | | | | | * commit '8a26ae5f94e613dbf7eb8e3c60462e966e409cdc': mpjpeg: Check stream allocation Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpjpeg: Check stream allocationLuca Barbato2015-06-281-0/+2
| | | | | | | | Bug-Id: CID 1308152
* | Merge commit 'b08569a23948db107e5e6175cd4c695427d5339d'Michael Niedermayer2015-06-289-34/+1773
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b08569a23948db107e5e6175cd4c695427d5339d': lavf: Replace the ASF demuxer Conflicts: Changelog libavformat/asf.h libavformat/asfdec.c libavformat/version.h tests/ref/fate/wmv8-drm-nodec tests/ref/seek/lavf-asf The rewritten demuxer is placed in a new file, the current demuxer is left as default. Carl has tested both and the one working better is default. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Replace the ASF demuxerAlexandra Hájková2015-06-287-1229/+1403
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old one is the result of the reverse engineering and guesswork. The new one has been written following the now-available specification. This work is part of Outreach Program for Women Summer 2014 activities for the Libav project. The fate references had to be changed because the old demuxer truncates the last frame in some cases, the new one handles it properly. The seek-test reference is changed because seeking works differently in the new demuxer. When seeking, the packet is not read from the stream directly, but it is rather constructed by the demuxer. That is why position is -1 now in the reference. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avformat/riffdec: Forward error code from avio_read() in ff_get_guid()Michael Niedermayer2015-06-281-2/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tests/fate/wma: use the existing reference files for wmapro testsMichael Niedermayer2015-06-281-2/+4
| | | | | | | | | | | | | | Theres no need to upload or use new files just because they are shorter. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '441e8ae5efd681055e5af6f4317fb60110de9dd0'Michael Niedermayer2015-06-281-4/+4
|\| | | | | | | | | | | | | * commit '441e8ae5efd681055e5af6f4317fb60110de9dd0': FATE: drop the last truncated frame from the wmapro tests Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * FATE: drop the last truncated frame from the wmapro testsAnton Khirnov2015-06-281-4/+4
| | | | | | | | | | Since it's truncated, the result depends on how specifically the demuxer and the decoder handle errors.
* | Merge commit 'd3ea79e8a65ddad4da11813bb43c46701295f68c'Michael Niedermayer2015-06-282-2/+2
|\| | | | | | | | | | | | | | | | | | | * commit 'd3ea79e8a65ddad4da11813bb43c46701295f68c': FATE: drop the last truncated frame from the wma lossless test Conflicts: tests/fate/lossless-audio.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * FATE: drop the last truncated frame from the wma lossless testAnton Khirnov2015-06-282-2/+2
| | | | | | | | | | Since it's truncated, the result depends on how specifically the demuxer and the decoder handle errors.
* | wavpack: use get_bits_long to read up to 32 bitsAndreas Cadhalpun2015-06-281-2/+2
| | | | | | | | | | | | | | get_bits should not be used for more than 25 bits. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>