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>
11 years ago
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>
11 years ago
892a6d0028
Merge commit '99a35d1ccbb6b6cd260ce5c8369a897a79fe6a3a'
* commit '99a35d1ccbb6b6cd260ce5c8369a897a79fe6a3a':
h264: move neighbor_transform_size into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
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>
11 years ago
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>
11 years ago
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>
11 years ago
20f5be1038
avcodec/h264_cabac: Fix intra4x4_pred_mode_cache argument to av_dlog()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
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>
11 years ago
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>
11 years ago
a2740a060b
Merge commit '4bd5ac200d15b4f458a50f66006549825f9fc865'
* commit '4bd5ac200d15b4f458a50f66006549825f9fc865':
h264: move {chroma,intra16x16}_pred_mode into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
c07b7e483a
Merge commit '5355ed6b20e941430c4f8fb82644e87a65366d61'
* commit '5355ed6b20e941430c4f8fb82644e87a65366d61':
h264: move {prev,next}_mb_skipped into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
acd6b407c3
Merge commit '06789ad3b71296a9e2fbd0278632d97a5d9af8d7'
* commit '06789ad3b71296a9e2fbd0278632d97a5d9af8d7':
h264: move qp_thresh into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
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>
11 years ago
cc31d9ce80
Merge commit 'd40ae0e595fe90b5583b9269f8bb000402bde5a6'
* commit 'd40ae0e595fe90b5583b9269f8bb000402bde5a6':
h264: do not copy qscale when updating per-thread contexts
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
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>
11 years ago
06c70d4537
avcodec/hevc_ps: Check cropping parameters more correctly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
665e0c10a6
Merge commit 'd8a45d2d49f54fde042b195f9d5859251252493d'
* commit 'd8a45d2d49f54fde042b195f9d5859251252493d':
h264_ps: properly check cropping parameters against overflow
Conflicts:
libavcodec/h264_ps.c
See: c3bd306e78
11 years ago
56febc993b
h264: move the slice type variables into the per-slice context
11 years ago
5f390eef8e
h264: move mb_[uv]linesize into the per-slice context
11 years ago
99a35d1ccb
h264: move neighbor_transform_size into the per-slice context
11 years ago
e6287f077c
h264: move {mv,ref}_cache into the per-slice context
11 years ago
f69574cf7a
h264: move non_zero_count_cache into the per-slice context
11 years ago
64c81b2cd0
h264: move *_samples_available into the per-slice context
11 years ago
7d8154edd5
h264: move intra4x4_pred_mode[_cache] into the per-slice context
11 years ago
8b00f4df20
h264: move some neighbour information into the per-slice context
11 years ago
4bd5ac200d
h264: move {chroma,intra16x16}_pred_mode into the per-slice context
11 years ago
5355ed6b20
h264: move {prev,next}_mb_skipped into the per-slice context
11 years ago
06789ad3b7
h264: move qp_thresh into the per-slice context
11 years ago
d231e84b06
h264: move the quantizers into the per-slice context
11 years ago
d40ae0e595
h264: do not copy qscale when updating per-thread contexts
It's a per-slice quantity constructed when parsing the slice header.
11 years ago
92c6c2a605
h264: split weighted pred-related vars into per-slice context
11 years ago
e4588e376a
Merge commit '5127c00b971b674f72609369b39a9c0f7c36977d'
* commit '5127c00b971b674f72609369b39a9c0f7c36977d':
hevc: zero the correct variables on invalid crop parameters
Conflicts:
libavcodec/hevc_ps.c
See: 57e5812198
11 years ago
0e69c16e96
Merge commit 'c929659bdd7d2d5848ea52e685a3164c7b901bb0'
* commit 'c929659bdd7d2d5848ea52e685a3164c7b901bb0':
hevc: make the crop sizes unsigned
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
d8a45d2d49
h264_ps: properly check cropping parameters against overflow
CC: libav-stable@libav.org
11 years ago
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
11 years ago
c929659bdd
hevc: make the crop sizes unsigned
11 years ago
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>
11 years ago
3c5c6870a7
avformat/movenc: avoid using uninitialized display_matrix_size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
276a8666d2
avcodec/metasound_data: remove unused variable lsp16s
the table was duplicated
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
215c2fe0ae
Merge commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995'
* commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995':
avconv: Print the avfilter errors
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
50255b7a86
Merge commit '342fc46c69199b076b7c210f42208ce39a2bde1c'
* commit '342fc46c69199b076b7c210f42208ce39a2bde1c':
cmdutils: Add a stream specifier to map usable streams
Conflicts:
cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
60b9373dbd
libavutil: add bmi2 optimized av_mod_uintp2
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
11 years ago
d13e521cc8
libavutil: add av_mod_uintp2
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
11 years ago
2a8198b32f
avcodec/libvpxenc: Set min/max quantizer to 0 for lossless mode
Fixes Ticket4246
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
d6dba15b97
avfilter/vf_mcdeint: Change enums to int, which are accessed via AVOption as int
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
1a79850a8f
avfilter/vf_overlay: Change enums to int, which are accessed via AVOption as int
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
59c06902e8
avfilter/vf_phase: Change enum to int, which is accessed via AVOption as int
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
22a6d48b0d
avconv: Print the avfilter errors
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years ago
342fc46c69
cmdutils: Add a stream specifier to map usable streams
It drops everything that cannot be used for re-encoding and/or
streamcopy.
11 years ago
e8446a6850
configure: Silence warnings about constant unsigned overflows in MSVC
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>
11 years ago
Michael Niedermayer
Anton Khirnov
Martin Vignali
James Almer
Luca Barbato