summaryrefslogtreecommitdiff
path: root/libavcodec/h264_picture.c
Commit message (Collapse)AuthorAge
* Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer2015-07-27
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/vdpau: Re-factor pre-hwaccel helper functions into separate headerPhilip Langdale2015-05-25
| | | | | | | | | | | | | | | | | | | | | | | | | | h264.h and hevc.h are mutually exclusive due to defining some of the same names. As such, we need to avoid forcing h264.h to be included if we want hevc decode acceleration to be possible. However, some of the pre-hwaccel helper functions need h264.h. To avoid messy collisions, let's move the declaration of all those helpers to a separate header which we will exclude for the hevc support (which will be hwaccel-only). Signed-off-by: Philip Langdale <philipl@overt.org>
* | Merge commit 'a0f2946068c62e18cb05ac25c0df3d86077251a6'Michael Niedermayer2015-04-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a0f2946068c62e18cb05ac25c0df3d86077251a6': h264: use properly allocated AVFrames Conflicts: libavcodec/h264.c libavcodec/h264.h libavcodec/h264_refs.c libavcodec/h264_slice.c libavcodec/svq3.c libavcodec/vda_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: use properly allocated AVFramesAnton Khirnov2015-04-29
| |
* | Merge commit '9d33bab583a82cf12286c65258a29c6888e1ff98'Michael Niedermayer2015-04-29
|\| | | | | | | | | | | | | | | | | | | * commit '9d33bab583a82cf12286c65258a29c6888e1ff98': h264: drop H264Context.ouputed_poc Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: drop H264Context.ouputed_pocAnton Khirnov2015-04-29
| | | | | | | | It is only set, but never used for anything.
* | Merge commit '27b0e6ebfd47b0c11156c18b90fa8c571f0f60c3'Michael Niedermayer2015-04-29
|\| | | | | | | | | | | | | * commit '27b0e6ebfd47b0c11156c18b90fa8c571f0f60c3': h264: drop needs_realloc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: drop needs_reallocAnton Khirnov2015-04-29
| | | | | | | | It is not needed anymore since switching to refcounted frames.
* | avcodec/h264: Use only one ERContextMichael Niedermayer2015-04-09
| | | | | | | | | | | | This fixes slice threads with error concealment Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a4d34e218f548d381e09c483e8dc6ad18a8d571c'Michael Niedermayer2015-04-04
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'a4d34e218f548d381e09c483e8dc6ad18a8d571c': h264: disable ER by default Conflicts: libavcodec/h264.c libavcodec/h264_picture.c libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: disable ER by defaultAnton Khirnov2015-04-03
| | | | | | | | | | The way it is currently designed is fundamentally unsafe and cannot be reasonably fixed without completely rewriting it.
* | Merge commit 'a12d3188cbec15e22070e139fa5cc541da07e2c3'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a12d3188cbec15e22070e139fa5cc541da07e2c3': h264: use a smaller struct for the ref lists Conflicts: libavcodec/h264_direct.c libavcodec/h264_mb.c libavcodec/h264_picture.c libavcodec/h264_refs.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: use a smaller struct for the ref listsAnton Khirnov2015-03-21
| | | | | | | | | | | | There is no need to store a whole H264Picture, with a full AVFrame embedded in it. This should allow getting rid of the embedded AVFrame later.
* | 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
| |
* | 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
| |
* | avcodec/h264: Setup decoder to have matching reference to the EC codeMichael Niedermayer2015-02-08
| | | | | | | | | | | | | | | | | | Also move EC ref initialization to where the EC code is called. Fixes out of array read Fixes: asan_heap-uaf_143f420_142_20110805_112659_ch0.mkv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ca1e36a8e4cd416142487071dbca734567bdaddf'Michael Niedermayer2014-06-20
|\| | | | | | | | | | | | | | | | | | | * commit 'ca1e36a8e4cd416142487071dbca734567bdaddf': h264: fix build when error resilience is disabled Conflicts: libavcodec/h264_picture.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: fix build when error resilience is disabledVittorio Giovara2014-06-20
| |
* | Merge commit '888dcd86755d37e55fd74166f6d38ad66d41db58'Michael Niedermayer2014-05-27
|\| | | | | | | | | | | | | * commit '888dcd86755d37e55fd74166f6d38ad66d41db58': h264_picture: Remove pointless dsputil.h #include Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_picture: Remove pointless dsputil.h #includeDiego Biurrun2014-05-27
| |
* | avcodec/h264_picture: Fix build without error resilienceMichael Niedermayer2014-05-20
| | | | | | | | | | Found-by: Dale Curtis <dalecurtis@chromium.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: mark recovery_cnt==0 frames as keyframesMichael Niedermayer2014-05-03
| | | | | | | | | | | | Fixes Ticket3063 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-20 16:35:41 +0000