summaryrefslogtreecommitdiff
path: root/libavcodec/h264_cabac.c
Commit message (Collapse)AuthorAge
...
| * h264: move mb_xy into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit 'a9b201cacf85d710b102010cb4baef97f00ea39b'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * commit 'a9b201cacf85d710b102010cb4baef97f00ea39b': h264: move cabac_init_idc into the per-slice context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move cabac_init_idc into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit 'bd3e460b73dd54a68dc253e010c239cefc8d8d55'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * commit 'bd3e460b73dd54a68dc253e010c239cefc8d8d55': h264: move direct_cache into the per-slice context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move direct_cache into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit '6479c79f5517e2881bc881e737b2dbce69553878'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * commit '6479c79f5517e2881bc881e737b2dbce69553878': h264: move mvd_cache into the per-slice context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move mvd_cache into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit '5c8280c3075dd54f26752c3a1185647578421703'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * commit '5c8280c3075dd54f26752c3a1185647578421703': h264: move last_qscale_diff into the per-slice context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move last_qscale_diff into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit 'e7226984ac13aacb84eae77a372df8ff7685848f'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * commit 'e7226984ac13aacb84eae77a372df8ff7685848f': h264: move [{top,left}_]cbp into the per-slice context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move [{top,left}_]cbp into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit '30da98adbda6de1f55188f9058a3a5c715049633'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | * commit '30da98adbda6de1f55188f9058a3a5c715049633': h264: move cabac[_state] into the per-slice context Conflicts: libavcodec/h264_cabac.c libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move cabac[_state] into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit 'bf03a878a76dea29b36f368759e9f66102b39a5f'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bf03a878a76dea29b36f368759e9f66102b39a5f': h264: move mb[_{padding,luma_dc}] into the per-slice context Conflicts: libavcodec/h264.h libavcodec/h264_cavlc.c libavcodec/h264_mb.c libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move mb[_{padding,luma_dc}] into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit 'b063582e0c4f775a8ba377488bd085595e0e7fae'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | * commit 'b063582e0c4f775a8ba377488bd085595e0e7fae': h264: move intra_pcm_ptr into the per-slice context Conflicts: libavcodec/h264.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move intra_pcm_ptr into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit '95eb35f30513e335990ad0d5dca6ddc318477291'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '95eb35f30513e335990ad0d5dca6ddc318477291': h264: move the ref lists variables into the per-slice context Conflicts: libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_direct.c libavcodec/h264_mb.c libavcodec/h264_picture.c libavcodec/h264_refs.c libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move the ref lists variables into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit 'ed451a08a46b2b07fd2dba3e55ffddd18ae6e3d6'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | * 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-21
| |
* | 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 '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 '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
| |
* | avcodec/h264_cabac: use int instead of long for mbb_xyMichael Niedermayer2015-02-01
| | | | | | | | | | | | The mb address fits in int Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'def69553e745e007925147b2e7e4b32c57d08fdf'Michael Niedermayer2015-01-15
|\| | | | | | | | | | | | | | | | | | | | | * commit 'def69553e745e007925147b2e7e4b32c57d08fdf': h264_cabac: Break infinite loops Conflicts: libavcodec/h264_cabac.c See: cdf0877bc341684c56ac1fe057397adbadf329ee Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_cabac: Break infinite loopsMichael Niedermayer2015-01-15
| | | | | | | | | | | | | | | | | | | | | | This fixes out of array reads and/or infinite loops. 30 is the maximum number of bits that can be read into coeff_abs below. CC: libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2'Michael Niedermayer2014-11-24
|\| | | | | | | | | | | | | | | | | | | | | * commit '277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2': lavu: move internal define to the only places where it is used Conflicts: libavcodec/h264_cabac.c libavutil/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: move internal define to the only places where it is usedVittorio Giovara2014-11-24
| |
| * h264_cabac: fix one fill_rectangle() indentation levelMichael Niedermayer2014-11-11
| | | | | | | | Bug-Id: CID 1087088
* | Merge commit '2143948381c8118bdc2f50bd4079520b9885bd54'Michael Niedermayer2014-09-05
|\| | | | | | | | | | | | | * commit '2143948381c8118bdc2f50bd4079520b9885bd54': Drop unnecessary av_unused attributes. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Drop unnecessary av_unused attributes.Diego Biurrun2014-09-05
| |