summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* postproc: Removed unecessary if/else branch when getting QP.Tucker DiNapoli2015-03-28
| | | | | | | There's still an if, as QP needs to be modified if isColor=0, but it still removes a unecessary branch. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2'Michael Niedermayer2015-03-28
|\ | | | | | | | | | | | | | | | | | | | | * commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2': lavc: add Intel libmfx-based H.264 encoder Conflicts: Changelog libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add Intel libmfx-based H.264 encoderAnton Khirnov2015-03-27
| |
* | Merge commit '9ba27c2348d26000257e891e40a72facb0d916be'Michael Niedermayer2015-03-28
|\| | | | | | | | | | | | | * commit '9ba27c2348d26000257e891e40a72facb0d916be': qsvdec: add 'decode' to the non-static function names Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qsvdec: add 'decode' to the non-static function namesAnton Khirnov2015-03-27
| |
* | Merge commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791'Michael Niedermayer2015-03-28
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791': qsvdec: split off some code that will be shared with the encoder Conflicts: libavcodec/Makefile libavcodec/qsvdec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qsvdec: split off some code that will be shared with the encoderAnton Khirnov2015-03-27
| |
* | Merge commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1'Michael Niedermayer2015-03-28
|\| | | | | | | | | | | | | | | | | | | * commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1': qsv: rename to qsvdec Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qsv: rename to qsvdecAnton Khirnov2015-03-27
| | | | | | | | This is to avoid conflicts with the upcoming QSV encoding support.
* | fate: Use a variable QP input for fate-filter-ppMichael Niedermayer2015-03-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: simplify filter-pp testsMichael Niedermayer2015-03-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avio: Document the end of list case in avio_read_dir()Michael Niedermayer2015-03-27
| | | | | | | | | | | | This was mentioned in a previous review Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: add inverse telecine filterHimangi Saraogi2015-03-27
| | | | | | | | | | Approved-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: add directory listing APILukasz Marek2015-03-27
| | | | | | | | | | | | | | | | API allows protocol implementations to provide API that allows to list directory content. API is similar to POSIX opendir/readdir/closedir. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_telecine: Avoid floating point valuesHimangi Saraogi2015-03-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/timer: give each printed value of STOP_TIMER a fixed lengthMichael Niedermayer2015-03-27
| | | | | | | | | | | | this makes the result easier to read Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/timer: show histogram of cpu cycles each run tookMichael Niedermayer2015-03-27
| | | | | | | | | | | | | | The new information is printed at verbose log level and can thus be switched on and off through the log level Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/cpu: add missing check for mmxext to av_force_cpu_flagsJames Almer2015-03-26
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | avfilter/vf_telecine: Fix loss of AVFrame properties in outputHimangi Saraogi2015-03-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/x86/hpeldsp_init: Put CONFIG_* first in if()Michael Niedermayer2015-03-26
| | | | | | | | | | | | This is more consistent and may fix a build failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264_slice: Put CONFIG_GRAY first in if()Michael Niedermayer2015-03-26
| | | | | | | | | | | | This is more consistent Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/arm/flacdsp_init_arm: Put CONFIG_FLAC_DECODER first in if()Michael Niedermayer2015-03-26
| | | | | | | | | | | | This is more consistent Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ac3dec: Put CONFIG* first in if()Michael Niedermayer2015-03-26
| | | | | | | | | | | | This may fix build failures with EAC3 disabled and is more consistent Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/dv: fix used dimension variablesMichael Niedermayer2015-03-26
| | | | | | | | | | | | | | Fixes null pointer dereference during seeking Fixes Ticket4395 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rmdec: fix support for 0 sized mdprMichael Niedermayer2015-03-26
| | | | | | | | | | | | Fixes Ticket4393 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_telecine: Fix AV desync by using the first input timestampHimangi Saraogi2015-03-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/nvenc: Need a separate class for each encoderPhilip Langdale2015-03-25
| | | | | | | | | | | | The encoders can't share a class instance. Signed-off-by: Philip Langdale <philipl@overt.org>
* | doc: remove the reference to supporting AviSynth 2.5Stephen Hutchinson2015-03-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: drop support of AviSynth 2.5Stephen Hutchinson2015-03-25
| | | | | | | | | | | | | | If the user attempts to use AviSynth 2.5, an error message will now tell them they need to upgrade. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale/output: Fix undefined shiftsMichael Niedermayer2015-03-25
| | | | | | | | | | | | | | Fixes: da14e86d8462be6493eab16bc2d40f88/asan_heap-oob_204cfd2_528_cov_340150052_COMPRESS.BMP Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: ifdef to avoid implicit function declaration errorsStephen Hutchinson2015-03-25
| | | | | | | | | | | | | | | | The demuxer doesn't use these functions, so it shouldn't affect anything. Investigate whether this can be fixed by how headers are checked in configure. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/j2kenc: Initialize variable to silence compiler warningsHimangi Saraogi2015-03-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil: make AVFrameSideData buffers ref-counted.Ronald S. Bultje2015-03-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu/frame: move av_frame_copy_props() up in the file.Ronald S. Bultje2015-03-25
| | | | | | | | | | | | Preparation for following patch. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/nvenc_h265: add missing version bump and changelog entryJames Almer2015-03-25
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | configure: add missing dependency for nvenc_h265James Almer2015-03-25
| | | | | | | | | | | | Should fix compilation of builds without nvenc Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec/nvenc: Add support for H.265 encodingPhilip Langdale2015-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | Sufficiently new nvenc hardware (GM20x or later) has support for H.265 encoding. This works the same as the H.264 encoder except the codec parameters are different. Due to the fact that common codec parameters are not shareable, there's quite a bit of conditional logic you'd wish we could do without, but such is life. Signed-off-by: Philip Langdale <philipl@overt.org> Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
* | avcodec/h264: Remove bits_per_raw_sample hacksMichael Niedermayer2015-03-25
| | | | | | | | | | | | | | | | | | Fixes assertion failure Fixes: f12c79769501ee471a5c731b8304ffcb/signal_sigabrt_7ffff6ac8cc9_3766_cov_4267830138_undemuxable_h264.ts Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: update headers against AviSynth+Stephen Hutchinson2015-03-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix option name in documentationGiorgio Vazzana2015-03-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Terminate SPS in avci100_1080i_extradata to avoid warnings ↵Michael Niedermayer2015-03-24
| | | | | | | | | | | | | | during parsing Fixes: AVCI100_Test.mxf Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/pixfmt: Add missing AV_ prefix to PIX_FMT_YUV411PMichael Niedermayer2015-03-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/nvenc: Drop support for old nvenc apiTimo Rothenpieler2015-03-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/msrledec: More verbose error messageMichael Niedermayer2015-03-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/msrledec: restructure msrle_decode_pal4() based on the line number ↵Michael Niedermayer2015-03-24
| | | | | | | | | | | | | | | | | | | | instead of the pixel pointer Fixes out of array access Fixes: da14e86d8462be6493eab16bc2d40f88/asan_heap-oob_204cfd2_528_cov_340150052_COMPRESS.BMP Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: check color parameter type explicitly.Jochen Strunk2015-03-24
| | | | | | | | | | | | | | | | | | | | | | Fixes ticket #4387. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Note, Vittorio Giovara had submitted a very similar fix to me privately a few hours before this, iam applying Jochens because it comes with a commit message too and i had not yet applied Vittorios, but For sake of credit, Vittorio independently solved this first
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2015-03-24
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: lavf/matroskaenc: List subtitle codecs with fake codec_tags to allow remuxing. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavf/matroskaenc: List subtitle codecs with fake codec_tags to allow remuxing.Carl Eugen Hoyos2015-03-24
| | | | | | | | | | | | Fixes remuxing of DVBSUB to mkv.
* | | Merge commit '1188119624e42c1b2ce5be6137d2e6c6f4f03328'Michael Niedermayer2015-03-24
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1188119624e42c1b2ce5be6137d2e6c6f4f03328': avisynth: update documentation about the avisynth_c.h header Conflicts: doc/general.texi Not merged as FFmpeg provides the needed headers in compat/ Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | avisynth: update documentation about the avisynth_c.h headerStephen Hutchinson2015-03-24
| | | | | | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>