Michael Niedermayer
cc2cfdc497
Merge commit '95eb35f30513e335990ad0d5dca6ddc318477291'
...
* 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>
10 years ago
Michael Niedermayer
27b3522ba3
Merge commit '7747726667c86877feed30c9e18460cb8e63f551'
...
* commit '7747726667c86877feed30c9e18460cb8e63f551':
h264: move map_col_to_list0[_field] into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
bd76a4822f
Merge commit 'ee0d774dfa94655e44707ff3e02f4a4d282c1963'
...
* commit 'ee0d774dfa94655e44707ff3e02f4a4d282c1963':
h264: move dist_scale_factor[_field] into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
20477a4ecb
Merge commit 'be69f0a800903b7573b18d9287d18b2f368b8b11'
...
* commit 'be69f0a800903b7573b18d9287d18b2f368b8b11':
h264: move col_{parity,fieldoff} into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
a8ac4c9b06
Merge commit '066aafced4dc6c7c9e7b37082635472249f1e93e'
...
* commit '066aafced4dc6c7c9e7b37082635472249f1e93e':
h264: move direct_spatial_mv_pred into the per-slice context
Conflicts:
libavcodec/h264_mvpred.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
4ffbeddd35
Merge commit 'ed451a08a46b2b07fd2dba3e55ffddd18ae6e3d6'
...
* commit 'ed451a08a46b2b07fd2dba3e55ffddd18ae6e3d6':
h264: move sub_mb_type into the per-slice context
Conflicts:
libavcodec/h264_cabac.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
97c8ecaada
Merge commit '56febc993b928ccc039a32158ca60b234c311875'
...
* 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>
10 years ago
Michael Niedermayer
2cc08cad9e
Merge commit '5f390eef8ee2b8adab00c5d2923a52aa261eb999'
...
* 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>
10 years ago
Michael Niedermayer
892a6d0028
Merge commit '99a35d1ccbb6b6cd260ce5c8369a897a79fe6a3a'
...
* commit '99a35d1ccbb6b6cd260ce5c8369a897a79fe6a3a':
h264: move neighbor_transform_size into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
f1436a7f96
Merge commit 'e6287f077c3e8e4aca11e61dd4bade1351439e6b'
...
* 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>
10 years ago
Michael Niedermayer
b7e0356cc3
Merge commit 'f69574cf7aca4fe4d57a2155e925f37fc863474d'
...
* 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>
10 years ago
Michael Niedermayer
6ec279b54c
Merge commit '64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e'
...
* 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>
10 years ago
Michael Niedermayer
20f5be1038
avcodec/h264_cabac: Fix intra4x4_pred_mode_cache argument to av_dlog()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
6abd1e901c
Merge commit '7d8154edd594981e7891d57de91f2260f8a62939'
...
* commit '7d8154edd594981e7891d57de91f2260f8a62939':
h264: move intra4x4_pred_mode[_cache] into the per-slice context
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
61635c7a88
Merge commit '8b00f4df20f4a8ab0656fdaf7d00233a6515a052'
...
* 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>
10 years ago
Michael Niedermayer
a2740a060b
Merge commit '4bd5ac200d15b4f458a50f66006549825f9fc865'
...
* commit '4bd5ac200d15b4f458a50f66006549825f9fc865':
h264: move {chroma,intra16x16}_pred_mode into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
c07b7e483a
Merge commit '5355ed6b20e941430c4f8fb82644e87a65366d61'
...
* commit '5355ed6b20e941430c4f8fb82644e87a65366d61':
h264: move {prev,next}_mb_skipped into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
acd6b407c3
Merge commit '06789ad3b71296a9e2fbd0278632d97a5d9af8d7'
...
* commit '06789ad3b71296a9e2fbd0278632d97a5d9af8d7':
h264: move qp_thresh into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
c27f53b9fb
Merge commit 'd231e84b06a9964c840cff4e228509f706165fb6'
...
* 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>
10 years ago
Michael Niedermayer
cc31d9ce80
Merge commit 'd40ae0e595fe90b5583b9269f8bb000402bde5a6'
...
* commit 'd40ae0e595fe90b5583b9269f8bb000402bde5a6':
h264: do not copy qscale when updating per-thread contexts
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
756dc7bd18
Merge commit '92c6c2a605f9b077b8fbc25b7ed6625541232b87'
...
* 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>
10 years ago
Michael Niedermayer
06c70d4537
avcodec/hevc_ps: Check cropping parameters more correctly
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
665e0c10a6
Merge commit 'd8a45d2d49f54fde042b195f9d5859251252493d'
...
* commit 'd8a45d2d49f54fde042b195f9d5859251252493d':
h264_ps: properly check cropping parameters against overflow
Conflicts:
libavcodec/h264_ps.c
See: c3bd306e78
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Anton Khirnov
95eb35f305
h264: move the ref lists variables into the per-slice context
10 years ago
Anton Khirnov
7747726667
h264: move map_col_to_list0[_field] into the per-slice context
10 years ago
Anton Khirnov
ee0d774dfa
h264: move dist_scale_factor[_field] into the per-slice context
10 years ago
Anton Khirnov
be69f0a800
h264: move col_{parity,fieldoff} into the per-slice context
10 years ago
Anton Khirnov
066aafced4
h264: move direct_spatial_mv_pred into the per-slice context
10 years ago
Anton Khirnov
ed451a08a4
h264: move sub_mb_type into the per-slice context
10 years ago
Anton Khirnov
56febc993b
h264: move the slice type variables into the per-slice context
10 years ago
Anton Khirnov
5f390eef8e
h264: move mb_[uv]linesize into the per-slice context
10 years ago
Anton Khirnov
99a35d1ccb
h264: move neighbor_transform_size into the per-slice context
10 years ago
Anton Khirnov
e6287f077c
h264: move {mv,ref}_cache into the per-slice context
10 years ago
Anton Khirnov
f69574cf7a
h264: move non_zero_count_cache into the per-slice context
10 years ago
Anton Khirnov
64c81b2cd0
h264: move *_samples_available into the per-slice context
10 years ago
Anton Khirnov
7d8154edd5
h264: move intra4x4_pred_mode[_cache] into the per-slice context
10 years ago
Anton Khirnov
8b00f4df20
h264: move some neighbour information into the per-slice context
10 years ago
Anton Khirnov
4bd5ac200d
h264: move {chroma,intra16x16}_pred_mode into the per-slice context
10 years ago
Anton Khirnov
5355ed6b20
h264: move {prev,next}_mb_skipped into the per-slice context
10 years ago
Anton Khirnov
06789ad3b7
h264: move qp_thresh into the per-slice context
10 years ago
Anton Khirnov
d231e84b06
h264: move the quantizers into the per-slice context
10 years ago
Anton Khirnov
d40ae0e595
h264: do not copy qscale when updating per-thread contexts
...
It's a per-slice quantity constructed when parsing the slice header.
10 years ago
Anton Khirnov
92c6c2a605
h264: split weighted pred-related vars into per-slice context
10 years ago
Michael Niedermayer
e4588e376a
Merge commit '5127c00b971b674f72609369b39a9c0f7c36977d'
...
* commit '5127c00b971b674f72609369b39a9c0f7c36977d':
hevc: zero the correct variables on invalid crop parameters
Conflicts:
libavcodec/hevc_ps.c
See: 57e5812198
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
0e69c16e96
Merge commit 'c929659bdd7d2d5848ea52e685a3164c7b901bb0'
...
* commit 'c929659bdd7d2d5848ea52e685a3164c7b901bb0':
hevc: make the crop sizes unsigned
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Anton Khirnov
d8a45d2d49
h264_ps: properly check cropping parameters against overflow
...
CC: libav-stable@libav.org
10 years ago
Anton Khirnov
5127c00b97
hevc: zero the correct variables on invalid crop parameters
...
It's the output_window that is applied to the output frame, not
pic_conf_win
10 years ago
Anton Khirnov
c929659bdd
hevc: make the crop sizes unsigned
10 years ago
Michael Niedermayer
294bb6cbd7
avcodec/hevc_refs: Silence "Could not find ref with POC" for CRA/BLA
...
Avoids error messages during seeking
Found-by: cousin_luigi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
3c5c6870a7
avformat/movenc: avoid using uninitialized display_matrix_size
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago