summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'be0b4c70ec40d7f9ac8e416a4379d4a387421184'Michael Niedermayer2013-10-03
|\ | | | | | | | | | | | | | | | | | | * commit 'be0b4c70ec40d7f9ac8e416a4379d4a387421184': atrac3: Replace a silly counter variable name with plain 'j' Conflicts: libavcodec/atrac3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * atrac3: Replace a silly counter variable name with plain 'j'Diego Biurrun2013-10-03
| |
* | avcodec/h264_sei: make SEI type truncated message more informativeMichael Niedermayer2013-10-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000dec: Zero code and quant styleMichael Niedermayer2013-10-03
| | | | | | | | | | | | | | | | | | | | This prevents future frames from using half initialized/inconsistent structures Fixes assertion failure Fixes Ticket2897 Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tiff_common: Improve formating of long arraysMichael Niedermayer2013-10-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: avoid direct access to lowres use av_codec_g/set_lowres()Michael Niedermayer2013-10-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: add av_codec_get_max_lowres()Michael Niedermayer2013-10-03
| | | | | | | | | | Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_histogram: add mirrored waveform modeMarton Balint2013-10-02
| | | | | | | | | | | | Added parameter to mirror the waveform (high values are shown on top in column mode) Signed-off-by: Marton Balint <cus@passwd.hu>
* | avfilter/vf_histogram: fix segfault in parade waveform mode for subsampled ↵Marton Balint2013-10-02
| | | | | | | | | | | | formats Signed-off-by: Marton Balint <cus@passwd.hu>
* | Merge remote-tracking branch 'rbultje/master'Michael Niedermayer2013-10-03
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * rbultje/master: Full-pixel MC functions. VP9 MC (ssse3) optimizations. Native VP9 decoder. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Full-pixel MC functions.Ronald S. Bultje2013-10-02
| | | | | | | | | | | | Decoding time of ped1080p.webm goes from 11.3sec to 11.1sec.
| * | VP9 MC (ssse3) optimizations.Ronald S. Bultje2013-10-02
| | | | | | | | | | | | Decoding time of ped1080p.webm goes from 20.7sec to 11.3sec.
| * | Native VP9 decoder.Ronald S. Bultje2013-10-02
| | | | | | | | | | | | | | | Authors: Ronald S. Bultje <rsbultje gmail com>, Clement Boesch <u pkh me>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-03
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: mark deprecated AVCodec.max_lowres for removal on next bump Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavc: mark deprecated AVCodec.max_lowres for removal on next bumpAnton Khirnov2013-10-02
| | |
* | | Merge commit '06e7301a2efa8dededecbe6836ee5b59bf7e5e76'Michael Niedermayer2013-10-03
|\| | | | | | | | | | | | | | | | | | | | * commit '06e7301a2efa8dededecbe6836ee5b59bf7e5e76': vf_interlace: do not process an already interlaced frame Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | vf_interlace: do not process an already interlaced frameVittorio Giovara2013-10-02
| | | | | | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | | ffprobe: print stream channel_layout when availableStefano Sabatini2013-10-03
| | | | | | | | | | | | Fix trac ticket #3006.
* | | Print pix_fmt name on h264 context reinitialisation.Carl Eugen Hoyos2013-10-03
| | |
* | | ffmpeg: add support to force specific AVCodecsMichael Niedermayer2013-10-02
| | | | | | | | | | | | | | | | | | | | | | | | previously only codec_ids could be forced, which did not allow forcing a specific implementation like libopenjpeg vs jpeg2000. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat: add support to force specific AVCodecsMichael Niedermayer2013-10-02
| | | | | | | | | | | | | | | | | | | | | | | | previously only codec_ids could be forced, which did not allow forcing a specific implementation like libopenjpeg vs jpeg2000. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/utils: pass AVFormatContext to find_decoder()Michael Niedermayer2013-10-02
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | VC1 VDPAU: Mark missing reference frames as such.Reimar Döffinger2013-10-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the code passes some nonsense values as references instead, causing corruption with NVidia's and assertion failures with Mesa's implementation. For non-corrupted input this mostly happens in interlaced bitstreams, e.g. http://samples.mplayerhq.hu/V-codecs/WMV9/interlaced/480i30__codec_WVC1__mode_2__framerate_29.970__type_2__preproc_17.wmv. The != VDP_INVALID handle assert does not trigger (and probably is quite nonsense) because the frames are initialized to 0. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | mov: fix trun / pseudo_stream_id handlingMichael Niedermayer2013-10-02
| | | | | | | | | | | | | | | | | | This fixes simple concatenated h264 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/imgconvert/get_color_type: fix type for PAL8Michael Niedermayer2013-10-02
| | | | | | | | | | | | | | | | | | | | | | | | Fixes Ticket3008 Fate changes as PAL8 gets used instead of BGR8 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec: use designated initializers for bitstream filtersPaul B Mahol2013-10-02
| | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-02
|\| | | | | | | | | | | | | | | | | | | | * qatar/master: rtmp: alias rtmp_listen to listen Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | rtmp: alias rtmp_listen to listenLuca Barbato2013-10-01
| | | | | | | | | | | | Make it uniform with the other protocols.
* | | Merge commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1'Michael Niedermayer2013-10-02
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1': mxf: Remove a typo Conflicts: libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mxf: Remove a typoLuca Barbato2013-10-01
| | | | | | | | | | | | Introduced in 93370d1216
* | | Merge commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad'Michael Niedermayer2013-10-02
|\| | | | | | | | | | | | | | | | | | | | * commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad': asfdec: Check the return value of asf_read_stream_properties Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | asfdec: Check the return value of asf_read_stream_propertiesMartin Storsjö2013-09-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure errors in setting stream parameters are passed on to the caller. This avoids successfully opening files while some parameters aren't filled in properly. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | | avfilter/avf_showspectrum: use the name 's' for the pointer to the private ↵Clément Bœsch2013-10-02
| | | | | | | | | | | | context
* | | avfilter/af_afade: use the name 's' for the pointer to the private contextPaul B Mahol2013-10-02
| | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | | ffmpeg: dont return reserved valuesMichael Niedermayer2013-10-02
| | | | | | | | | | | | | | | Found-by: Daemon404 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avfilter/vf_removelogo: use the name 's' for the pointer to the private contextClément Bœsch2013-10-02
| | |
* | | avfilter/af_silencedetect: use the name 's' for the pointer to the private ↵Paul B Mahol2013-10-02
| | | | | | | | | | | | | | | | | | context Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | | atrac3: Generalize gain compensation codeMaxim Poliakovski2013-10-02
| | | | | | | | | | | | | | | | | | | | | Move it to the ATRAC common code, so it can be reused in the umpcoming ATRAC3+ decoder. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | atrac3/decode_gain_control: cosmeticsMaxim Poliakovski2013-10-02
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | atrac3: rename num_gain_data to num_pointsMaxim Poliakovski2013-10-02
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | atrac3: Rename GainInfo to AtracGainInfoMaxim Poliakovski2013-10-02
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | atrac: limit line length to 80 charsMaxim Poliakovski2013-10-02
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | atrac: Move doxygen comments to the headerMaxim Poliakovski2013-10-02
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | atrac: Update copyright info and file description.Maxim Poliakovski2013-10-02
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | atrac: Add missing av_cold.Maxim Poliakovski2013-10-02
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/wmalosslessdec: check block_alignMichael Niedermayer2013-10-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | Code copied from wmaprodec Fixes null pointer dereference Fixes Ticket3002 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Revert "Merge commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7'" (configure: ↵Michael Niedermayer2013-10-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly set zlib dependencies for all components) The reverted commit introduced undefined behavior. undefined in the sense that the evaluation order of the dependencies affects the results Fixes Ticket2920 This reverts commit c32db6adab9942781cc5a23f62abb839a5595a83, reversing changes made to 05f1b4e2ecc4683467669a190e3a53df413de805. Alternative solutions would be to change the dependency solver to handle non trivial dependencies or to enable zlib by default before the dependency solver, this would leave a zlib dependency in the libs though then even when no zlib is needed or used.
* | | avfilter/vf_histogram: change order of histograms for planar rgbPaul B Mahol2013-10-01
| | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | | avfilter/vf_histogram: add support for subsampled planar yuv modes in ↵Marton Balint2013-10-01
| | | | | | | | | | | | | | | | | | waveform mode Signed-off-by: Marton Balint <cus@passwd.hu>
* | | avfilter/vf_histogram: improve waveform speedMarton Balint2013-10-01
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>