summaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'ed451a08a46b2b07fd2dba3e55ffddd18ae6e3d6'Michael Niedermayer2015-03-216-52/+51
|\ | | | | | | | | | | | | | | | | | | * commit 'ed451a08a46b2b07fd2dba3e55ffddd18ae6e3d6': h264: move sub_mb_type into the per-slice context Conflicts: libavcodec/h264_cabac.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move sub_mb_type into the per-slice contextAnton Khirnov2015-03-216-52/+51
| |
* | Merge commit '56febc993b928ccc039a32158ca60b234c311875'Michael Niedermayer2015-03-2114-130/+135
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '56febc993b928ccc039a32158ca60b234c311875': h264: move the slice type variables into the per-slice context Conflicts: libavcodec/h264.c libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move the slice type variables into the per-slice contextAnton Khirnov2015-03-2113-123/+128
| |
* | Merge commit '5f390eef8ee2b8adab00c5d2923a52aa261eb999'Michael Niedermayer2015-03-215-63/+64
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '5f390eef8ee2b8adab00c5d2923a52aa261eb999': h264: move mb_[uv]linesize into the per-slice context Conflicts: libavcodec/h264.h libavcodec/h264_mb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move mb_[uv]linesize into the per-slice contextAnton Khirnov2015-03-215-64/+64
| |
* | Merge commit '99a35d1ccbb6b6cd260ce5c8369a897a79fe6a3a'Michael Niedermayer2015-03-213-8/+8
|\ \ | |/ | | | | | | | | | | * commit '99a35d1ccbb6b6cd260ce5c8369a897a79fe6a3a': h264: move neighbor_transform_size into the per-slice context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move neighbor_transform_size into the per-slice contextAnton Khirnov2015-03-213-8/+8
| |
* | Merge commit 'e6287f077c3e8e4aca11e61dd4bade1351439e6b'Michael Niedermayer2015-03-2112-248/+267
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'e6287f077c3e8e4aca11e61dd4bade1351439e6b': h264: move {mv,ref}_cache into the per-slice context Conflicts: libavcodec/h264_cabac.c libavcodec/h264_mb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move {mv,ref}_cache into the per-slice contextAnton Khirnov2015-03-2112-248/+267
| |
* | Merge commit 'f69574cf7aca4fe4d57a2155e925f37fc863474d'Michael Niedermayer2015-03-2110-103/+120
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'f69574cf7aca4fe4d57a2155e925f37fc863474d': h264: move non_zero_count_cache into the per-slice context Conflicts: libavcodec/h264.c libavcodec/h264_cabac.c libavcodec/h264_cavlc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move non_zero_count_cache into the per-slice contextAnton Khirnov2015-03-2110-107/+124
| |
* | Merge commit '64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e'Michael Niedermayer2015-03-217-50/+53
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e': h264: move *_samples_available into the per-slice context Conflicts: libavcodec/h264.c libavcodec/h264_mb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move *_samples_available into the per-slice contextAnton Khirnov2015-03-217-48/+51
| |
* | avcodec/h264_cabac: Fix intra4x4_pred_mode_cache argument to av_dlog()Michael Niedermayer2015-03-211-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7d8154edd594981e7891d57de91f2260f8a62939'Michael Niedermayer2015-03-218-64/+71
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '7d8154edd594981e7891d57de91f2260f8a62939': h264: move intra4x4_pred_mode[_cache] into the per-slice context Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move intra4x4_pred_mode[_cache] into the per-slice contextAnton Khirnov2015-03-218-64/+71
| |
* | Merge commit '8b00f4df20f4a8ab0656fdaf7d00233a6515a052'Michael Niedermayer2015-03-219-144/+156
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '8b00f4df20f4a8ab0656fdaf7d00233a6515a052': h264: move some neighbour information into the per-slice context Conflicts: libavcodec/h264_cabac.c libavcodec/h264_cavlc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move some neighbour information into the per-slice contextAnton Khirnov2015-03-219-144/+156
| |
* | Merge commit '4bd5ac200d15b4f458a50f66006549825f9fc865'Michael Niedermayer2015-03-216-26/+26
|\ \ | |/ | | | | | | | | | | * commit '4bd5ac200d15b4f458a50f66006549825f9fc865': h264: move {chroma,intra16x16}_pred_mode into the per-slice context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move {chroma,intra16x16}_pred_mode into the per-slice contextAnton Khirnov2015-03-216-26/+26
| |
* | Merge commit '5355ed6b20e941430c4f8fb82644e87a65366d61'Michael Niedermayer2015-03-214-10/+10
|\ \ | |/ | | | | | | | | | | * commit '5355ed6b20e941430c4f8fb82644e87a65366d61': h264: move {prev,next}_mb_skipped into the per-slice context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move {prev,next}_mb_skipped into the per-slice contextAnton Khirnov2015-03-214-10/+10
| |
* | Merge commit '06789ad3b71296a9e2fbd0278632d97a5d9af8d7'Michael Niedermayer2015-03-212-6/+5
|\ \ | |/ | | | | | | | | | | * commit '06789ad3b71296a9e2fbd0278632d97a5d9af8d7': h264: move qp_thresh into the per-slice context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move qp_thresh into the per-slice contextAnton Khirnov2015-03-212-6/+5
| |
* | Merge commit 'd231e84b06a9964c840cff4e228509f706165fb6'Michael Niedermayer2015-03-2111-119/+144
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'd231e84b06a9964c840cff4e228509f706165fb6': h264: move the quantizers into the per-slice context Conflicts: libavcodec/dxva2_h264.c libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move the quantizers into the per-slice contextAnton Khirnov2015-03-2111-120/+145
| |
* | Merge commit 'd40ae0e595fe90b5583b9269f8bb000402bde5a6'Michael Niedermayer2015-03-211-2/+0
|\ \ | |/ | | | | | | | | | | * commit 'd40ae0e595fe90b5583b9269f8bb000402bde5a6': h264: do not copy qscale when updating per-thread contexts Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: do not copy qscale when updating per-thread contextsAnton Khirnov2015-03-211-2/+0
| | | | | | | | It's a per-slice quantity constructed when parsing the slice header.
* | Merge commit '92c6c2a605f9b077b8fbc25b7ed6625541232b87'Michael Niedermayer2015-03-2111-165/+220
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '92c6c2a605f9b077b8fbc25b7ed6625541232b87': h264: split weighted pred-related vars into per-slice context Conflicts: libavcodec/h264.c libavcodec/h264.h libavcodec/h264_mb.c libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: split weighted pred-related vars into per-slice contextAnton Khirnov2015-03-2111-159/+214
| |
* | avcodec/hevc_ps: Check cropping parameters more correctlyMichael Niedermayer2015-03-211-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd8a45d2d49f54fde042b195f9d5859251252493d'Michael Niedermayer2015-03-211-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'd8a45d2d49f54fde042b195f9d5859251252493d': h264_ps: properly check cropping parameters against overflow Conflicts: libavcodec/h264_ps.c See: c3bd306e78f9e3ca2f136f5b30cbe49fa0884f82 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_ps: properly check cropping parameters against overflowAnton Khirnov2015-03-211-4/+16
| | | | | | | | CC: libav-stable@libav.org
| * hevc: zero the correct variables on invalid crop parametersAnton Khirnov2015-03-211-4/+4
| | | | | | | | | | It's the output_window that is applied to the output frame, not pic_conf_win
* | Merge commit 'c929659bdd7d2d5848ea52e685a3164c7b901bb0'Michael Niedermayer2015-03-211-4/+4
|\ \ | |/ | | | | | | | | | | * commit 'c929659bdd7d2d5848ea52e685a3164c7b901bb0': hevc: make the crop sizes unsigned Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: make the crop sizes unsignedAnton Khirnov2015-03-211-4/+4
| |
| * webp: ensure that each transform is only used onceAndreas Cadhalpun2015-03-191-1/+9
| | | | | | | | | | | | | | | | | | | | | | According to the WebP Lossless Bitstream Specification "each transform is allowed to be used only once". If a transform is more than once this can lead to memory corruption. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avcodec/hevc_refs: Silence "Could not find ref with POC" for CRA/BLAMichael Niedermayer2015-03-211-2/+3
| | | | | | | | | | | | | | Avoids error messages during seeking Found-by: cousin_luigi Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/metasound_data: remove unused variable lsp16sMartin Vignali2015-03-201-179/+0
| | | | | | | | | | | | the table was duplicated Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libvpxenc: Set min/max quantizer to 0 for lossless modeMichael Niedermayer2015-03-201-4/+9
| | | | | | | | | | | | | | Fixes Ticket4246 Reviewed-by: James Zern <jzern@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/xvididct: add some yasm guardsJames Almer2015-03-201-1/+3
| | | | | | | | | | | | Should fix compilation on compilers with less-than-ideal dead code elimination Signed-off-by: James Almer <jamrial@gmail.com>
* | x86/xvididct: remove obsolete function prototypesJames Almer2015-03-202-5/+2
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec/dv: remove unused var dvquantareasMartin Vignali2015-03-201-2/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dv: remove unused var dv100qstepMartin Vignali2015-03-201-7/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libdcadec: add missing version bump and changelog entryJames Almer2015-03-191-1/+1
| |
* | avcodec: Fix libdcadec include dirKacper Michajłow2015-03-201-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: add libdcadec decoderHendrik Leppkes2015-03-203-0/+199
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: add profile define for DTS ExpressHendrik Leppkes2015-03-201-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dnxhddec: reset cur_field for non interlaced framesMichael Niedermayer2015-03-191-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud