summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
...
| * h264_mb: constify all uses of H264ContextAnton Khirnov2015-03-21
| | | | | | | | | | All the variables modified by this code are either per-MB arrays or have been moved to the per-slice context
* | Merge commit '51822879e7732ee8175dad98dde1a135f6e5c1a4'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * commit '51822879e7732ee8175dad98dde1a135f6e5c1a4': h264_mb: constify block_offset Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_mb: constify block_offsetAnton Khirnov2015-03-21
| | | | | | | | It is read-only in this code.
* | Merge commit '3bea6409a1868354a1d29b34de424c3636c222b7'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * commit '3bea6409a1868354a1d29b34de424c3636c222b7': h264_mvpred: constify all uses of H264Context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_mvpred: constify all uses of H264ContextAnton Khirnov2015-03-21
| | | | | | | | | | All the variables modified by this code are either per-MB arrays or have been moved to the per-slice context
* | Merge commit '460176aa19acb8d8bdb52af1ec97891e0f65843c'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * commit '460176aa19acb8d8bdb52af1ec97891e0f65843c': h264.h: constify all uses of H264Context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264.h: constify all uses of H264ContextAnton Khirnov2015-03-21
| | | | | | | | | | All the variables modified by this code are either per-MB arrays or have been moved to the per-slice context
* | Merge commit 'd27b8248a6ee7e64c68c46c23e00d703b9caa50c'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * commit 'd27b8248a6ee7e64c68c46c23e00d703b9caa50c': h264_direct: constify all uses of H264Context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_direct: constify all uses of H264ContextAnton Khirnov2015-03-21
| | | | | | | | | | All the variables modified by this code are either per-MB arrays or have been moved to the per-slice context
* | Merge commit 'f42485dbce614b3f63182845da43db690b427b7c'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f42485dbce614b3f63182845da43db690b427b7c': h264: use a separate GetBitContext for slice data Conflicts: libavcodec/h264.c libavcodec/h264_cavlc.c libavcodec/h264_parser.c libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: use a separate GetBitContext for slice dataAnton Khirnov2015-03-21
| |
* | Merge commit '2ea00e35e4e0b58f7a306dd55d8f72a21c32c946'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | * commit '2ea00e35e4e0b58f7a306dd55d8f72a21c32c946': h264: do not abuse the context as a temporary storage in get_last_needed_nal() Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: do not abuse the context as a temporary storage in get_last_needed_nal()Anton Khirnov2015-03-21
| | | | | | | | Use a local variable instead.
* | Merge commit '404a416d4b1fcbf9db5569481d8181f296c01ea9'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | * commit '404a416d4b1fcbf9db5569481d8181f296c01ea9': h264: remove some remnants of data partitioning Conflicts: libavcodec/h264.c libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: remove some remnants of data partitioningAnton Khirnov2015-03-21
| |
* | Merge commit '7bbc254d646ed9cf6deffc3fda75ae6729f95979'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | * commit '7bbc254d646ed9cf6deffc3fda75ae6729f95979': h264: move resync_mb_{x,y} into the per-slice context Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move resync_mb_{x,y} into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit 'd4d9068cdf8f4b2b87ae87a2ef880d243f77b977'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd4d9068cdf8f4b2b87ae87a2ef880d243f77b977': h264: move mb_{x,y} into the per-slice context Conflicts: libavcodec/h264.c libavcodec/h264_cavlc.c libavcodec/h264_mb.c libavcodec/h264_slice.c libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move mb_{x,y} into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit '0edbe6faa7ef80daf0e84353cbe733389bf1a522'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '0edbe6faa7ef80daf0e84353cbe733389bf1a522': h264: move mb_xy into the per-slice context Conflicts: libavcodec/h264.c libavcodec/h264_cabac.c libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move mb_xy into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit '07c5ca551b7327d3c4e33738cc0cd2d5ac2779fa'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | * commit '07c5ca551b7327d3c4e33738cc0cd2d5ac2779fa': h264: move is_complex into the per-slice context Conflicts: libavcodec/h264_slice.c libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move is_complex into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit '47a0d393504d6726c4a235951153bee0abb3f7d6'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | * commit '47a0d393504d6726c4a235951153bee0abb3f7d6': h264: move mb_skip_run into the per-slice context Conflicts: libavcodec/h264_cavlc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move mb_skip_run into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit '9951907f6fc37a8d41566dbee09f7c15ff587de6'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | * commit '9951907f6fc37a8d41566dbee09f7c15ff587de6': h264: move redundant_pic_count into the per-slice context Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move redundant_pic_count 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 'e6c90ce94f1b07f50cea2babf7471af455cca0ff'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * commit 'e6c90ce94f1b07f50cea2babf7471af455cca0ff': h264: move loopfilter parameters into the per-slice context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move loopfilter parameters 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 'a67f8ae9a2c8529bf6a635e8ca4e3483592708b1'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | * commit 'a67f8ae9a2c8529bf6a635e8ca4e3483592708b1': h264: move mvd_table into the per-slice context Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move mvd_table 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
| |
* | avcodec/h264_slice: Merge 2 memcpy()Michael Niedermayer2015-03-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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
| |