summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
...
| * h264: move rbsp_buffer into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit '582683b6ac798ed2a004a4e2121b7bd47892bbfd'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | * 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>
| * h264: move remaining ER stuff into the per-slice contextAnton Khirnov2015-03-21
| |
* | avcodec/mpegvideo: support mbskip_table==NULL in ff_print_debug_info2()Michael Niedermayer2015-03-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/error_resilience: Fix mbskip_table==NULL codepathMichael Niedermayer2015-03-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5bc69f38c1af71fbcbfb4b5efa77d0aeb5424c04'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * commit '5bc69f38c1af71fbcbfb4b5efa77d0aeb5424c04': error_resilience: do not require mbintra/skip tables Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * error_resilience: do not require mbintra/skip tablesAnton Khirnov2015-03-21
| | | | | | | | h264dec does not use them at all and only allocates them for ER.
* | Merge commit 'c377e04d8aa74d030672e9a4788a700b0695fc14'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | * commit 'c377e04d8aa74d030672e9a4788a700b0695fc14': h264: move top_borders into the per-slice context Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move top_borders into the per-slice contextAnton Khirnov2015-03-21
| | | | | | | | | | Also change the method for allocating to the same one as used by edge_emu_buffer.
* | Merge commit '36d04801ba9d8622c2d759c172aea18561bac74d'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | * 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>
| * h264: move the scratch buffers into the per-slice contextAnton Khirnov2015-03-21
| | | | | | | | | | | | | | Also change the method for allocating them. Instead of two possible alloc calls from different places, just ensure they are allocated at the start of each slice. This should be simpler and less bug-prone than the previous method.
* | Merge commit '34d4c605e9a5116d5289b35633ade5b01cacab24'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * commit '34d4c605e9a5116d5289b35633ade5b01cacab24': h264_loopfilter: constify all uses of H264Context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_loopfilter: 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 '7505c8dfba255f8e6c6dbb574d0cec91da16f24d'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * commit '7505c8dfba255f8e6c6dbb574d0cec91da16f24d': h264_cavlc: constify all uses of H264Context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_cavlc: 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 'ba7e165b864d69da4f0c79ec7757cb351535002f'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * commit 'ba7e165b864d69da4f0c79ec7757cb351535002f': h264_cabac: constify all uses of H264Context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_cabac: 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 '5c4b98de4d101ea715ef86847306a510afd0db0c'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * commit '5c4b98de4d101ea715ef86847306a510afd0db0c': h264.c: constify all uses of H264Context in slice and lower-level functions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264.c: constify all uses of H264Context in slice and lower-level functionsAnton 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 'e9b2383bf86b38ad18a001801aee20c8182e29bd'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'e9b2383bf86b38ad18a001801aee20c8182e29bd': h264: move mb_mbaff into the per-slice context Conflicts: libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move mb_mbaff into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit 'bc98e8c0e0a8babfea35c98855e366b29cbe1191'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | * commit 'bc98e8c0e0a8babfea35c98855e366b29cbe1191': h264: move mb_field_decoding_flag into the per-slice context Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move mb_field_decoding_flag into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit '6490a0c0fbe0e55f765ea2aa2e8495181ea1f719'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | * commit '6490a0c0fbe0e55f765ea2aa2e8495181ea1f719': h264_mb: constify all uses of H264Context Conflicts: libavcodec/h264.h libavcodec/h264_mb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * 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>