summaryrefslogtreecommitdiff
path: root/libavcodec/pthread_frame.c
Commit message (Collapse)AuthorAge
* Merge commit '9f90b24877016e7140b9b14e4b1acee663bb6d8a'Hendrik Leppkes2015-09-05
|\ | | | | | | | | | | | | * commit '9f90b24877016e7140b9b14e4b1acee663bb6d8a': lavc: Drop deprecated get_buffer related functions Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: Drop deprecated get_buffer related functionsVittorio Giovara2015-08-28
| | | | | | | | Deprecated in 11/2012.
* | disable deprecation warnings in deprecated codeAndreas Cadhalpun2015-08-22
| | | | | | | | | | Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | 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>
| * lavc: AV-prefix all codec capabilitiesVittorio Giovara2015-07-27
| | | | | | | | | | | | Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370'Michael Niedermayer2015-07-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370': Deprecate avctx.coded_frame Conflicts: ffmpeg.c libavcodec/a64multienc.c libavcodec/asvenc.c libavcodec/cljrenc.c libavcodec/dpxenc.c libavcodec/gif.c libavcodec/mpegvideo_enc.c libavcodec/nvenc.c libavcodec/proresenc_kostya.c libavcodec/pthread_frame.c libavcodec/rawenc.c libavcodec/sunrastenc.c libavcodec/tiffenc.c libavcodec/version.h libavcodec/xbmenc.c libavcodec/xwdenc.c libavdevice/v4l2.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * Deprecate avctx.coded_frameVittorio Giovara2015-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rationale is that coded_frame was only used to communicate key_frame, pict_type and quality to the caller, as well as a few other random fields, in a non predictable, let alone consistent way. There was agreement that there was no use case for coded_frame, as it is a full-sized AVFrame container used for just 2-3 int-sized properties, which shouldn't even belong into the AVCodecContext in the first place. The appropriate AVPacket flag can be used instead of key_frame, while quality is exported with the new AVPacketSideData quality factor. There is no replacement for the other fields as they were unreliable, mishandled or just not used at all. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec/pthread_frame: clear priv_data, avoid stale pointer in error caseMichael Niedermayer2015-07-16
| | | | | | | | | | | | | | Fixes: b4b47bc2b3fb7ca710bfffe5aa969e37_signal_sigabrt_7ffff70eccc9_744_nc_sample2.avi with memlimit of 4194304 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/pthread_frame: check avctx on deallocationMichael Niedermayer2015-07-13
| | | | | | | | | | | | | | | | Fixes null pointer dereferences Fixes: af1a5a33e67e479f439239097bd0d4fd_signal_sigsegv_7ffff713351a_152_Dolby_Rain_Logo.pmp with memlimit of 8388608 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/pthread_frame: Correcting typo of "occurred"John Adlum2015-07-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pthread_frame: forward error codes when flushingAndreas Cadhalpun2015-07-01
| | | | | | | | | | | | | | This is the first part of the fix for ticket #4370. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | Merge commit '0994e142132200c706f704271b5a7ae81d128f5c'Michael Niedermayer2015-06-01
|\| | | | | | | | | | | | | | | | | | | * commit '0994e142132200c706f704271b5a7ae81d128f5c': pthread: Check memory allocation Conflicts: libavcodec/pthread_frame.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pthread: Check memory allocationVittorio Giovara2015-05-31
| |
* | avcodec/pthread_frame: Fix memleak with frame threads and allocated AVOptionsMichael Niedermayer2015-04-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ac4a5e3abd8a022ab32245ad527ffc37eabab8b1'Michael Niedermayer2014-11-06
|\| | | | | | | | | | | | | | | * commit 'ac4a5e3abd8a022ab32245ad527ffc37eabab8b1': pthreads_frame: Do not leak on failure path See: 11679e1b90f6e52a3643efb45d06ea5adf65098a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pthreads_frame: Do not leak on failure pathLuca Barbato2014-11-06
| | | | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1135767 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec/pthread_frame: Simplify code by using av_reallocp_array()Michael Niedermayer2014-11-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41'Michael Niedermayer2014-10-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41': lavc: deprecate the use of AVCodecContext.time_base for decoding Conflicts: libavcodec/avcodec.h libavcodec/h264.c libavcodec/mpegvideo_parser.c libavcodec/utils.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate the use of AVCodecContext.time_base for decodingAnton Khirnov2014-10-15
| | | | | | | | | | | | | | | | | | | | | | When decoding, this field holds the inverse of the framerate that can be written in the headers for some codecs. Using a field called 'time_base' for this is very misleading, as there are no timestamps associated with it. Furthermore, this field is used for a very different purpose during encoding. Add a new field, called 'framerate', to replace the use of time_base for decoding.
* | Merge commit '990e2f3555bb0adae122d3599938ddcfee46e2d1'Michael Niedermayer2014-08-05
|\| | | | | | | | | | | | | * commit '990e2f3555bb0adae122d3599938ddcfee46e2d1': avcodec: Suppress deprecation warnings from DTG code scheduled for removal Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: Suppress deprecation warnings from DTG code scheduled for removalDiego Biurrun2014-08-04
| |
* | avcodec/pthread_frame: fix setting hwaccel with threads and get_format()Michael Niedermayer2014-07-09
| | | | | | | | | | | | | | | | Fixes assertion failure with vdpau and vlc Fixes Ticket3742 Tested-by: oromit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pthread_frame: Use av_mallocz_array()Michael Niedermayer2014-06-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix compilation errors when deprecated features are disabled.Dale Curtis2014-05-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pthread_frame: remove unused variableMichael Niedermayer2014-05-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9929b3564c0dca42ed7baa6798ef15b6f0013c83'Michael Niedermayer2014-05-19
|\| | | | | | | | | | | | | | | | | | | * commit '9929b3564c0dca42ed7baa6798ef15b6f0013c83': pthread_frame: simplify the code by using new AVPacket API Conflicts: libavcodec/pthread_frame.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pthread_frame: simplify the code by using new AVPacket APIAnton Khirnov2014-05-19
| | | | | | | | This also handles side data properly.
* | Merge commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8'Michael Niedermayer2014-05-12
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8': lavc: Add hwaccel private data and init/uninit callbacks Conflicts: libavcodec/avcodec.h libavcodec/internal.h libavcodec/pthread_frame.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Add hwaccel private data and init/uninit callbacksAnton Khirnov2014-05-11
| |
* | Merge commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425'Michael Niedermayer2014-05-11
|\| | | | | | | | | | | | | | | | | | | | | * commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425': lavc: Add an internal wrapper around get_format() Conflicts: libavcodec/h264_slice.c libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-04-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegvideo: operate with pointers to AVFrames instead of whole structs Conflicts: libavcodec/h261dec.c libavcodec/h263dec.c libavcodec/intrax8.c libavcodec/mpeg12enc.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/mpegvideo_xvmc.c libavcodec/msmpeg4.c libavcodec/ratecontrol.c libavcodec/vaapi.c libavcodec/vc1dec.c libavcodec/vdpau_vc1.c See: fc567ac49e17151f00f31b59030cd10f952612ef Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: operate with pointers to AVFrames instead of whole structswm42014-04-09
| | | | | | | | | | | | | | | | | | | | | | | | | | The most interesting parts are initialization in ff_MPV_common_init() and uninitialization in ff_MPV_common_end(). ff_mpeg_unref_picture and ff_thread_release_buffer have additional NULL checks for Picture.f, because these functions can be called on uninitialized or partially initialized Pictures. NULL pointer checks are added to ff_thread_release_buffer() stub function. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec/pthread_frame: fix missing unlock on errorMichael Niedermayer2014-04-06
| | | | | | | | | | Fixes CID1197057 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/pthread: copy packet side data.Nicolas George2014-03-08
| |
* | Merge commit 'd1f9563d502037239185c11578cc614bdf0c5870'Michael Niedermayer2014-03-01
|\| | | | | | | | | | | | | * commit 'd1f9563d502037239185c11578cc614bdf0c5870': pthread_frame: flush all threads on flush, not just the first one Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pthread_frame: flush all threads on flush, not just the first oneAnton Khirnov2014-02-28
| | | | | | | | | | | | | | | | | | avcodec_flush_buffers() must release all internally held references according to its documentation, for which all the threads need to be flushed. CC:libav-stable@libav.org Bug-Id: vlc/9665
* | Merge commit '9cbf2d78f0a9c19129e7a70b2281a450d386c6d9'Michael Niedermayer2014-01-06
|\| | | | | | | | | | | | | * commit '9cbf2d78f0a9c19129e7a70b2281a450d386c6d9': pthread_frame: unref decoded frames on failure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pthread_frame: unref decoded frames on failureAnton Khirnov2014-01-06
| | | | | | | | | | | | | | This is similar to what the non-threaded code already does. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | avcodec/pthread_frame: Fix memleak of AVCodecContext on errorMichael Niedermayer2013-12-11
| | | | | | | | | | Fixes CID1135767 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac'Michael Niedermayer2013-12-09
|\| | | | | | | | | | | | | | | | | | | * commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac': pthread_frame: use the AVFrame API properly. Conflicts: libavcodec/pthread_frame.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pthread_frame: use the AVFrame API properly.Anton Khirnov2013-12-09
| | | | | | | | | | Remove the extended_data workaround, all decoders should now handle this properly.
* | avcodec/pthread: check packet buffer allocationHendrik Leppkes2013-11-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a553c6a347d3d28d7ee44c3df3d5c4ee780dba23'Michael Niedermayer2013-11-19
|\| | | | | | | | | | | | | | | | | | | | | * commit 'a553c6a347d3d28d7ee44c3df3d5c4ee780dba23': lavc: use buf[0] instead of data[0] in checks whether a frame is allocated Conflicts: libavcodec/h264_refs.c libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: use buf[0] instead of data[0] in checks whether a frame is allocatedAnton Khirnov2013-11-18
| | | | | | | | data[0] may be NULL for valid frames with hwaccel pixel formats.
* | Merge commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9'Michael Niedermayer2013-11-04
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9': lavc: move AVCodecContext.pkt to AVCodecInternal Conflicts: libavcodec/internal.h libavcodec/rawdec.c libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: move AVCodecContext.pkt to AVCodecInternalAnton Khirnov2013-11-04
| | | | | | | | It's a private field, not meant to be accessed from outside lavc.
* | Merge commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12'Michael Niedermayer2013-11-04
|\| | | | | | | | | | | | | | | | | | | | | * commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12': pthread: store thread contexts in AVCodecInternal instead of AVCodecContext Conflicts: libavcodec/internal.h libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pthread: store thread contexts in AVCodecInternal instead of AVCodecContextAnton Khirnov2013-11-04
| | | | | | | | | | | | It's a private field, it should not be visible to callers. Deprecate AVCodecContext.thread_opaque
* | Merge commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb'Michael Niedermayer2013-11-04
|/ | | | | | | | | | | * commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb': lavc: split slice and frame threading functions into separate files Conflicts: libavcodec/Makefile libavcodec/pthread.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* lavc: split slice and frame threading functions into separate filesAnton Khirnov2013-11-04
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 19:55:10 +0000