summaryrefslogtreecommitdiff
path: root/libavcodec/h264_slice.c
Commit message (Collapse)AuthorAge
* Merge commit 'ce42316321145c435029dc288c2b5f1d48519dde'Michael Niedermayer2014-09-27
|\ | | | | | | | | | | | | | | | | | | * commit 'ce42316321145c435029dc288c2b5f1d48519dde': h264: Always invoke the get_format() callback Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Always invoke the get_format() callbackRémi Denis-Courmont2014-09-26
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'e87f5e4e5f2e2e36b0b7826d708cda7049877af0'Michael Niedermayer2014-08-26
|\| | | | | | | | | | | | | | | | | | | * commit 'e87f5e4e5f2e2e36b0b7826d708cda7049877af0': h264: fully check cropping amount from sps Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: fully check cropping amount from spsVittorio Giovara2014-08-26
| | | | | | | | | | Even if sps.crop is true, the cropping amount may be zero. Fixes a sample with a valid but broken container cropping.
* | lavc/h264_slice: Add a missing newline to an error message.Carl Eugen Hoyos2014-08-24
| |
* | avcodec/h264_slice: More complete cleanup in h264_slice_header_init()Michael Niedermayer2014-08-23
| | | | | | | | | | | | | | Fixes null pointer dereference Fixes Ticket3873 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '835f798c7d20bca89eb4f3593846251ad0d84e4b'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '835f798c7d20bca89eb4f3593846251ad0d84e4b': mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixes Conflicts: libavcodec/h261dec.c libavcodec/intrax8.c libavcodec/mjpegenc.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpeg4videoenc.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/x86/mpegvideoenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixesDiego Biurrun2014-08-15
| |
* | Merge commit '2d60444331fca1910510038dd3817bea885c2367'Michael Niedermayer2014-07-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2d60444331fca1910510038dd3817bea885c2367': dsputil: Split motion estimation compare bits off into their own context Conflicts: configure libavcodec/Makefile libavcodec/arm/Makefile libavcodec/dvenc.c libavcodec/error_resilience.c libavcodec/h264.h libavcodec/h264_slice.c libavcodec/me_cmp.c libavcodec/me_cmp.h libavcodec/motion_est.c libavcodec/motion_est_template.c libavcodec/mpeg4videoenc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split motion estimation compare bits off into their own contextDiego Biurrun2014-07-17
| |
* | Merge commit '2db953f84671997e936f91140ffb5143c1537844'Michael Niedermayer2014-07-17
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '2db953f84671997e936f91140ffb5143c1537844': h264: K&R formatting cosmetics Conflicts: libavcodec/h264.c libavcodec/h264_direct.c libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: K&R formatting cosmeticsLuca Barbato2014-07-17
| | | | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2'Michael Niedermayer2014-06-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2': Add av_image_check_sar() and use it to validate SAR Conflicts: libavcodec/dpx.c libavcodec/dvdec.c libavcodec/ffv1dec.c libavcodec/utils.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add av_image_check_sar() and use it to validate SARJustin Ruggles2014-06-20
| |
* | lavc/h264_slice: clarify informational message in case of disabled slice ↵Stefano Sabatini2014-06-20
| | | | | | | | | | | | multi-threaded decoding Also suggest what can be done to workaround the limitation.
* | avcodec/h264: Use named identifier for single thread fall-back return from ↵Michael Niedermayer2014-06-19
| | | | | | | | | | | | ff_h264_decode_slice_header() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: fix frame skip codeMichael Niedermayer2014-06-16
| | | | | | | | | | | | Fixes Ticket3475 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264_slice: support skipping loop filtering for non key framesMichael Niedermayer2014-06-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: use the correct level for droping non intra framesMichael Niedermayer2014-06-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264_slice: fix macro ()Michael Niedermayer2014-05-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '67afcefb35932b420998f6f3fda46c7c85848a3f'Michael Niedermayer2014-05-12
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '67afcefb35932b420998f6f3fda46c7c85848a3f': lavc: Add new VDA hwaccel Conflicts: configure libavcodec/vda.h libavcodec/vda_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Add new VDA hwaccelAnton Khirnov2014-05-11
| | | | | | | | | | | | | | | | | | It leverages the new hwaccel 1.2 features: - get_buffer2 is never called - the internal context is automatically initialized/deinitialized Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'a871ef0cc936612bdb0e643196be72efcf0c8986'Michael Niedermayer2014-05-11
|\| | | | | | | | | | | | | | | | | | | * commit 'a871ef0cc936612bdb0e643196be72efcf0c8986': hwaccel: Rename priv_data_size to frame_priv_data_size Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hwaccel: Rename priv_data_size to frame_priv_data_sizeAnton Khirnov2014-05-11
| | | | | | | | This describes more accurately what this field is for.
* | Merge commit '5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f'Michael Niedermayer2014-05-11
|\| | | | | | | | | | | | | | | | | | | * commit '5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f': lavc: set AVCodecContext.hwaccel in ff_get_format() Conflicts: libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: set AVCodecContext.hwaccel in ff_get_format()Anton Khirnov2014-05-11
| | | | | | | | This way each decoder does not have to do the same thing manually.
| * lavc: Add an internal wrapper around get_format()Anton Khirnov2014-05-11
| | | | | | | | It will be useful in the following commits.
* | avcodec/h264: mark recovery_cnt==0 frames as keyframesMichael Niedermayer2014-05-03
| | | | | | | | | | | | Fixes Ticket3063 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521'Michael Niedermayer2014-04-30
|\| | | | | | | | | | | | | | | | | | | * commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521': h264: drop commented out cruft Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: drop commented out cruftAnton Khirnov2014-04-29
| |
* | Use correct msvc type specifiers for ptrdiff_t and size_t.Carl Eugen Hoyos2014-04-24
| | | | | | | | | | | | | | The Windows runtime aborts if it finds %t or %z. Fixes ticket #3472. Reviewed-by: Ronald Bultje
* | Merge commit '34c5a6660a9e5e3cf301691bb29d011638953dc2'Michael Niedermayer2014-04-19
|\| | | | | | | | | | | | | | | | | | | * commit '34c5a6660a9e5e3cf301691bb29d011638953dc2': h264: codec reinit: remove statements without effect Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: codec reinit: remove statements without effectJanne Grunau2014-04-19
| | | | | | | | | | | | | | avctx->coded_{height,width} will always equal h->{height,width} since init_dimensions() does that explicitly, Size changes are detected by changes in mb_{height,width} earlier and propagated through the needs_reinit variable.
* | avcodec/h264: clear cur_pic structure instead of duplicating it in ↵Michael Niedermayer2014-04-03
| | | | | | | | | | | | | | | | | | ff_h264_update_thread_context() Fixes crash Found-by: iive Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: use ff_h264_set_erpic() instead of memsetMichael Niedermayer2014-03-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-24
|/ | | | | | | | | | | * qatar/master: h264: Split h264 slice decoding from nal decoding Conflicts: libavcodec/Makefile libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* h264: Split h264 slice decoding from nal decodingLuca Barbato2014-03-23