summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '56febc993b928ccc039a32158ca60b234c311875'Michael Niedermayer2015-03-21
|\ | | | | | | | | | | | | | | | | | | | | | | | | * 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-21
| |
* | Merge commit '5f390eef8ee2b8adab00c5d2923a52aa261eb999'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | * 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-21
| |
* | Merge commit '99a35d1ccbb6b6cd260ce5c8369a897a79fe6a3a'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * 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-21
| |
* | Merge commit 'e6287f077c3e8e4aca11e61dd4bade1351439e6b'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | * 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-21
| |
* | Merge commit 'f69574cf7aca4fe4d57a2155e925f37fc863474d'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | * 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-21
| |
* | Merge commit '64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | * 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-21
| |
* | avcodec/h264_cabac: Fix intra4x4_pred_mode_cache argument to av_dlog()Michael Niedermayer2015-03-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7d8154edd594981e7891d57de91f2260f8a62939'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | * 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-21
| |
* | Merge commit '8b00f4df20f4a8ab0656fdaf7d00233a6515a052'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | * 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-21
| |
* | Merge commit '4bd5ac200d15b4f458a50f66006549825f9fc865'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * 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-21
| |
* | Merge commit '5355ed6b20e941430c4f8fb82644e87a65366d61'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * 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-21
| |
* | Merge commit '06789ad3b71296a9e2fbd0278632d97a5d9af8d7'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * 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-21
| |
* | Merge commit 'd231e84b06a9964c840cff4e228509f706165fb6'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | * 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-21
| |
* | Merge commit 'd40ae0e595fe90b5583b9269f8bb000402bde5a6'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * 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-21
| | | | | | | | It's a per-slice quantity constructed when parsing the slice header.
* | Merge commit '92c6c2a605f9b077b8fbc25b7ed6625541232b87'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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-21
| |
* | avcodec/hevc_ps: Check cropping parameters more correctlyMichael Niedermayer2015-03-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd8a45d2d49f54fde042b195f9d5859251252493d'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | * 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-21
| | | | | | | | CC: libav-stable@libav.org
* | Merge commit '5127c00b971b674f72609369b39a9c0f7c36977d'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | * commit '5127c00b971b674f72609369b39a9c0f7c36977d': hevc: zero the correct variables on invalid crop parameters Conflicts: libavcodec/hevc_ps.c See: 57e5812198aada016e9ba4149123c541f8c8a7ec Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: zero the correct variables on invalid crop parametersAnton Khirnov2015-03-21
| | | | | | | | | | It's the output_window that is applied to the output frame, not pic_conf_win
* | Merge commit 'c929659bdd7d2d5848ea52e685a3164c7b901bb0'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * commit 'c929659bdd7d2d5848ea52e685a3164c7b901bb0': hevc: make the crop sizes unsigned Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: make the crop sizes unsignedAnton Khirnov2015-03-21
| |
* | avcodec/hevc_refs: Silence "Could not find ref with POC" for CRA/BLAMichael Niedermayer2015-03-21
| | | | | | | | | | | | | | Avoids error messages during seeking Found-by: cousin_luigi Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: avoid using uninitialized display_matrix_sizeMichael Niedermayer2015-03-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/metasound_data: remove unused variable lsp16sMartin Vignali2015-03-20
| | | | | | | | | | | | the table was duplicated Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995'Michael Niedermayer2015-03-20
|\| | | | | | | | | | | | | | | | | | | * commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995': avconv: Print the avfilter errors Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: Print the avfilter errorsLuca Barbato2015-03-20
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '342fc46c69199b076b7c210f42208ce39a2bde1c'Michael Niedermayer2015-03-20
|\| | | | | | | | | | | | | | | | | | | * commit '342fc46c69199b076b7c210f42208ce39a2bde1c': cmdutils: Add a stream specifier to map usable streams Conflicts: cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: Add a stream specifier to map usable streamsLuca Barbato2015-03-20
| | | | | | | | | | It drops everything that cannot be used for re-encoding and/or streamcopy.
* | libavutil: add bmi2 optimized av_mod_uintp2James Almer2015-03-20
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | libavutil: add av_mod_uintp2James Almer2015-03-20
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec/libvpxenc: Set min/max quantizer to 0 for lossless modeMichael Niedermayer2015-03-20
| | | | | | | | | | | | | | Fixes Ticket4246 Reviewed-by: James Zern <jzern@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_mcdeint: Change enums to int, which are accessed via AVOption as intMichael Niedermayer2015-03-20
| | | | | | | | | | | | This fixes depending on implementation defined behavior Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_overlay: Change enums to int, which are accessed via AVOption as intMichael Niedermayer2015-03-20
| | | | | | | | | | | | This fixes depending on implementation defined behavior Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_phase: Change enum to int, which is accessed via AVOption as intMichael Niedermayer2015-03-20
| | | | | | | | | | | | This fixes depending on implementation defined behavior Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: Silence warnings about constant unsigned overflows in MSVCMichael Niedermayer2015-03-20
| | | | | | | | | | | | | | | | | | | | unsigned overflows are well defined in C and used for example in crypto and various other places. None of the affected warnings currently shown points to an actual defect untested Signed-off-by: Michael Niedermayer <michaelni@gmx.at>