summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avformat/mvdec: Use 64bit for ret to avoid overflowMichael Niedermayer2015-02-20
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/apngdec: Use 64bit for ret to avoid overflowMichael Niedermayer2015-02-20
| | | | | | Missed this hunk in first commit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/gxf: Use 64bit for res to avoid overflowMichael Niedermayer2015-02-20
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/idcin: Use 64bit for ret to avoid overflowMichael Niedermayer2015-02-20
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/apngdec: Use 64bit ret to avoid overflowMichael Niedermayer2015-02-20
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/asfdec: Use 64bit ret to avoid overflowMichael Niedermayer2015-02-20
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* wtvdec: fix integer overflow resulting in errors with large filesRodger Combs2015-02-20
| | | | | | This fixes a regression in 9fbc613f0df1628e7e78bca791fa8833846f8210 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* MAINTAINERS: Add Oleksij as maintainer for DSS*Michael Niedermayer2015-02-20
| | | | | | Also add a 2nd maintainer at the authors request (due to lack of time) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* hlsenc: remove the AVIOContext for the playlist from the muxer contextHendrik Leppkes2015-02-20
| | | | | | Its only used in one function, having it in the context serves no purpose. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/movenc: Move avid DNxHD padding to the correct spotKevin Wheatley2015-02-20
| | | | | | | | | | | | Outputting DNxHD into .mov containers 'corrupts' following atoms until end of stsd ffmpeg and qtdump could not decode pasp/colr atoms in the files made by ffmpeg, when outputting DNxHD due to the incorrect padding placement. Now we add the padding in the correct place Tidy up FATE changes due to padding changes. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/dca: move remaining tables to dcadataMichael Niedermayer2015-02-20
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/snowdec: Fix avmv_index incrementMichael Niedermayer2015-02-20
| | | | | | Fixes reading uninitialized memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avfilter/vf_eq: Add process_command to eq.Arwa Arif2015-02-20
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/dss_sp: Avoid a slow division and modulo in the pitch_lag calculationMichael Niedermayer2015-02-19
| | | | | | | Also check the combined_pitch for validity (which is needed to keep the behavior identical in the error case) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/dss_sp: de-obfuscate index inversionMichael Niedermayer2015-02-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/dss_sp: Protect DSS_SP_FORMULA() with a set of outside bracketsMichael Niedermayer2015-02-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/dss: Use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer2015-02-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/dss: Check sscanf() return value in dss_read_metadata_date()Michael Niedermayer2015-02-19
| | | | | | | Fixes writing uninitialized values into metadata without error in case parsing fails Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c'Michael Niedermayer2015-02-19
|\ | | | | | | | | | | | | | | | | | | * commit 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c': fate: Add tests for DSS Conflicts: tests/fate/audio.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: Add tests for DSSVittorio Giovara2015-02-19
| | | | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
* | Merge commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499'Michael Niedermayer2015-02-19
|\| | | | | | | | | | | | | | | | | | | | | * commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499': lavf: Add DSS demuxer Conflicts: libavformat/Makefile libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Add DSS demuxerOleksij Rempel2015-02-19
| | | | | | | | | | | | Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b'Michael Niedermayer2015-02-19
|\| | | | | | | | | | | | | | | | | | | | | * commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b': lavc: Add DSS SP decoder Conflicts: libavcodec/avcodec.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Add DSS SP decoderOleksij Rempel2015-02-19
| | | | | | | | | | | | Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23'Michael Niedermayer2015-02-19
|\| | | | | | | | | | | | | * commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23': qsv_api: fix building with libmfx disabled Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qsv_api: fix building with libmfx disabledAnton Khirnov2015-02-19
| |
* | Merge commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d'Michael Niedermayer2015-02-19
|\| | | | | | | | | | | | | * commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d': configure: add missing h264_qsv hwaccel deps Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: add missing h264_qsv hwaccel depsAnton Khirnov2015-02-19
| |
* | Merge commit '4e08c821106fc1d6d358864abf0d8488b12f38c6'Michael Niedermayer2015-02-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '4e08c821106fc1d6d358864abf0d8488b12f38c6': lavc: add an Intel libmfx-based H.264 decoder Conflicts: configure libavcodec/Makefile libavcodec/allcodecs.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add an Intel libmfx-based H.264 decoderAnton Khirnov2015-02-19
| | | | | | | | | | Based on the code by Luca Barbato <lu_zero@gentoo.org> and Yukinori Yamazoe <drocon11@gmail.com>.
* | Merge commit '31d2039cb42668ebcf08248bc48bbad44aa05f49'Michael Niedermayer2015-02-19
|\| | | | | | | | | | | | | | | | | | | | | * commit '31d2039cb42668ebcf08248bc48bbad44aa05f49': h264_parser: export video format and dimensions Conflicts: libavcodec/h264_parser.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_parser: export video format and dimensionsAnton Khirnov2015-02-19
| |
* | Merge commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a'Michael Niedermayer2015-02-19
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a': pixfmt: add a pixel format for QSV hwaccel Conflicts: doc/APIchanges libavutil/pixfmt.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pixfmt: add a pixel format for QSV hwaccelAnton Khirnov2015-02-19
| |
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2015-02-19
|\ \ | | | | | | | | | | | | | | | | | | | | | * cigaes/master: doc/faq: explain DAR/SAR preserving. doc: set documentencoding on toplevel texi files. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | doc/faq: explain DAR/SAR preserving.Nicolas George2015-02-19
| | |
| * | doc: set documentencoding on toplevel texi files.Nicolas George2015-02-19
| | | | | | | | | | | | | | | | | | Fix double UTF-8 encoding on output files. makeinfo / texi2any does not seem to provide a way of setting it globally for toplevel files.
* | | avformat/mov: Add simple ACLR atom reading to set the color range of the ↵Kevin Wheatley2015-02-19
|/ / | | | | | | | | | | | | | | | | | | | | | | | | incomming track for codec's like DNxHD that utilise AVID's proprietary atom. On input ACLR will be used to set colour range no matter which codec it is associated with. No change for when it will be output. Rework mov_read_extradata function to allow detection of truncated atom reads by callers. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/palettegen: raise cache size from 64k to 512kClément Bœsch2015-02-19
| | | | | | | | | | | | (or 32k to 256k in 32-bit) This is similar to a00bab347518d4824d51ec7078f1d84ca097c53b
* | Merge commit '0f532fd3f9b9ca974cea0feb8ddcaf4a7f3b23c5'Michael Niedermayer2015-02-19
|\| | | | | | | | | | | | | * commit '0f532fd3f9b9ca974cea0feb8ddcaf4a7f3b23c5': rv40: Return more meaningful error codes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rv40: Return more meaningful error codesHimangi Saraogi2015-02-19
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avcodec/wmalosslessdec: use sizeof() instead of a literal numberMichael Niedermayer2015-02-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_subtitles: Add () to protect the argument of the AA() macroMichael Niedermayer2015-02-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/sha: Protect macro arguments with ()Michael Niedermayer2015-02-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg_opt: Add missing MATCH_PER_TYPE_OPT() for data codecsMichael Niedermayer2015-02-18
| | | | | | | | | | | | Fixes: CID1270809 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd617e77cecc5b363ef1860955b548f4ac007add6'Michael Niedermayer2015-02-18
|\| | | | | | | | | | | | | | | * commit 'd617e77cecc5b363ef1860955b548f4ac007add6': libx265: Add crf private option See: 8b96e8dd28c83448c9b4af81b834deb9b525be80 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx265: Add crf private optionDerek Buitenhuis2015-02-18
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '2de887e45b664f44b51686f5979fa8ce6dfe2ec2'Michael Niedermayer2015-02-18
|\| | | | | | | | | | | | | | | * commit '2de887e45b664f44b51686f5979fa8ce6dfe2ec2': libx265: Reduce the scope of some variables See: b920db67317a31f0e8d4a010faa26dbd12b0dcdb Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx265: Reduce the scope of some variablesDerek Buitenhuis2015-02-18
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | tests: fate: adding fate-test for twofishSupraja Meedinti2015-02-18
| | | | | | | | | | Signed-off-by: Supraja Meedinti <supraja0493@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>