Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-03-28Merge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2'Michael Niedermayer
* commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2': lavc: add Intel libmfx-based H.264 encoder Conflicts: Changelog libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-28Merge commit '9ba27c2348d26000257e891e40a72facb0d916be'Michael Niedermayer
* commit '9ba27c2348d26000257e891e40a72facb0d916be': qsvdec: add 'decode' to the non-static function names Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-28Merge commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791'Michael Niedermayer
* 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>
2015-03-28Merge commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1'Michael Niedermayer
* commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1': qsv: rename to qsvdec Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-28lavc: add Intel libmfx-based H.264 encoderAnton Khirnov
2015-03-27qsvdec: add 'decode' to the non-static function namesAnton Khirnov
2015-03-27qsvdec: split off some code that will be shared with the encoderAnton Khirnov
2015-03-27qsv: rename to qsvdecAnton Khirnov
This is to avoid conflicts with the upcoming QSV encoding support.
2015-03-26avcodec/x86/hpeldsp_init: Put CONFIG_* first in if()Michael Niedermayer
This is more consistent and may fix a build failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-26avcodec/h264_slice: Put CONFIG_GRAY first in if()Michael Niedermayer
This is more consistent Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-26avcodec/arm/flacdsp_init_arm: Put CONFIG_FLAC_DECODER first in if()Michael Niedermayer
This is more consistent Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-26avcodec/ac3dec: Put CONFIG* first in if()Michael Niedermayer
This may fix build failures with EAC3 disabled and is more consistent Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-26avcodec/nvenc: Need a separate class for each encoderPhilip Langdale
The encoders can't share a class instance. Signed-off-by: Philip Langdale <philipl@overt.org>
2015-03-25avcodec/j2kenc: Initialize variable to silence compiler warningsHimangi Saraogi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-25avcodec/nvenc_h265: add missing version bump and changelog entryJames Almer
Signed-off-by: James Almer <jamrial@gmail.com>
2015-03-25avcodec/nvenc: Add support for H.265 encodingPhilip Langdale
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>
2015-03-25avcodec/h264: Remove bits_per_raw_sample hacksMichael Niedermayer
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>
2015-03-24avcodec/nvenc: Drop support for old nvenc apiTimo Rothenpieler
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-24avcodec/msrledec: More verbose error messageMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-24avcodec/msrledec: restructure msrle_decode_pal4() based on the line number ↵Michael Niedermayer
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>
2015-03-24Merge commit 'b21af32aed7e343f962753943e9f16baedfb1750'Michael Niedermayer
* commit 'b21af32aed7e343f962753943e9f16baedfb1750': lavc: Prefer x264 over openh264 if both libraries are available See: ddae03f69bc1c6ec97c028c91837710944427b83 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-23vaapi_h264: fix slice data offsetHendrik Leppkes
2015-03-23lavc: Prefer x264 over openh264 if both libraries are availableMichael Niedermayer
2015-03-23dxva2_h264: fix slice offset in long slice structsHendrik Leppkes
2015-03-23vaapi_h264: fix slice data offsetHendrik Leppkes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-23dxva2_h264: fix slice offset in long slice structsHendrik Leppkes
Fixes Ticket #4384 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-23avcodec/snow: fix support for odd dimensionsMichael Niedermayer
Fixes Ticket3914 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-22avcodec/jpeglsdec: support PAL1-PAL7Michael Niedermayer
Fixes Ticket3933 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-22avcodec/h264_cavlc: Drop local_ref_countMichael Niedermayer
This basically switches to the implementation from f6f7d1504134683c435e2c7d804279d982e52bb4 which seems faster Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-22avcodec/h264_cabac: Drop local_ref_countMichael Niedermayer
7966 -> 7897 decicycles This basically switches to the implementation from f6f7d1504134683c435e2c7d804279d982e52bb4 which seems faster Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-22avcodec/h264.h: Drop unused macroMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-22avcodec/h264_slice: update slice context linesizes when a new picture is ↵Michael Niedermayer
allocated previously they where only updated when decoding started and would thus have been inconsistent for a longer period of time leaving more chances for problems Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-22Merge commit 'c28ed1d743443e783537d279ae721be3bbdf7646'Michael Niedermayer
* commit 'c28ed1d743443e783537d279ae721be3bbdf7646': h264: move [uv]linesize to the per-slice context Conflicts: libavcodec/h264_mb.c libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-22Merge commit 'b53569e0681ff7bc99103ab4c961dbac3cc0fce6'Michael Niedermayer
* commit 'b53569e0681ff7bc99103ab4c961dbac3cc0fce6': h264_cabac: remove now unnecessary H264Context function parameters Conflicts: libavcodec/h264_cabac.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-22Merge commit 'a12d3188cbec15e22070e139fa5cc541da07e2c3'Michael Niedermayer
* commit 'a12d3188cbec15e22070e139fa5cc541da07e2c3': h264: use a smaller struct for the ref lists Conflicts: libavcodec/h264_direct.c libavcodec/h264_mb.c libavcodec/h264_picture.c libavcodec/h264_refs.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21Merge commit '94295106d20b32666a8c4e0d028ef79b9d3f3b7a'Michael Niedermayer
* commit '94295106d20b32666a8c4e0d028ef79b9d3f3b7a': h264_mb: remove an unused function parameter Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21Merge commit '2b4c38d3c647f409080606ef02b3363ada00be2c'Michael Niedermayer
* commit '2b4c38d3c647f409080606ef02b3363ada00be2c': h264: drop some mpegvideo remnants from draw_horiz_band() Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21Merge commit '5bf3c0fa49afd5bbf43aa841ff78007d72c80736'Michael Niedermayer
* commit '5bf3c0fa49afd5bbf43aa841ff78007d72c80736': h264: drop the now unused per-slice H264Contexts Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21Merge commit '51d8725a6e4c7f989d6f0f38b59cb54a2d72846c'Michael Niedermayer
* commit '51d8725a6e4c7f989d6f0f38b59cb54a2d72846c': h264: use the main H264Context as the parent for all slice contexts Conflicts: libavcodec/h264.c libavcodec/h264.h libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21Merge commit '92e0b7342c0490894cbcea4461380321e0569de2'Michael Niedermayer
* commit '92e0b7342c0490894cbcea4461380321e0569de2': h264_slice: constify all the uses of H264Context during slice decoding Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21vp9: make above buffer pointer 32-byte aligned.Ronald S. Bultje
Fixes ticket #4383 Signed-off-by: James Almer <jamrial@gmail.com>
2015-03-21Merge commit '3178f4d33ff62243f7cdddb081db516ea34396c9'Michael Niedermayer
* commit '3178f4d33ff62243f7cdddb081db516ea34396c9': h264: move rbsp_buffer into the per-slice context Conflicts: libavcodec/h264.c libavcodec/h264_parser.c libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21Merge commit '582683b6ac798ed2a004a4e2121b7bd47892bbfd'Michael Niedermayer
* commit '582683b6ac798ed2a004a4e2121b7bd47892bbfd': h264: move remaining ER stuff into the per-slice context Conflicts: libavcodec/h264.h libavcodec/h264_picture.c libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21avcodec/mpegvideo: support mbskip_table==NULL in ff_print_debug_info2()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21avcodec/error_resilience: Fix mbskip_table==NULL codepathMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21Merge commit '5bc69f38c1af71fbcbfb4b5efa77d0aeb5424c04'Michael Niedermayer
* commit '5bc69f38c1af71fbcbfb4b5efa77d0aeb5424c04': error_resilience: do not require mbintra/skip tables Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21Merge commit 'c377e04d8aa74d030672e9a4788a700b0695fc14'Michael Niedermayer
* commit 'c377e04d8aa74d030672e9a4788a700b0695fc14': h264: move top_borders into the per-slice context Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21Merge commit '36d04801ba9d8622c2d759c172aea18561bac74d'Michael Niedermayer
* commit '36d04801ba9d8622c2d759c172aea18561bac74d': h264: move the scratch buffers into the per-slice context Conflicts: libavcodec/h264.h libavcodec/h264_slice.c libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21Merge commit '34d4c605e9a5116d5289b35633ade5b01cacab24'Michael Niedermayer
* commit '34d4c605e9a5116d5289b35633ade5b01cacab24': h264_loopfilter: constify all uses of H264Context Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21Merge commit '7505c8dfba255f8e6c6dbb574d0cec91da16f24d'Michael Niedermayer
* commit '7505c8dfba255f8e6c6dbb574d0cec91da16f24d': h264_cavlc: constify all uses of H264Context Merged-by: Michael Niedermayer <michaelni@gmx.at>