aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/pthread_frame.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '9cbf2d78f0a9c19129e7a70b2281a450d386c6d9'Michael Niedermayer2014-01-061-0/+7
|\ | | | | | | | | | | | | * 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-061-0/+7
| | | | | | | | | | | | | | 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-111-0/+1
| | | | | | | | | | Fixes CID1135767 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac'Michael Niedermayer2013-12-091-10/+12
|\| | | | | | | | | | | | | | | | | | | * 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-091-10/+12
| | | | | | | | | | Remove the extended_data workaround, all decoders should now handle this properly.
* | avcodec/pthread: check packet buffer allocationHendrik Leppkes2013-11-251-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a553c6a347d3d28d7ee44c3df3d5c4ee780dba23'Michael Niedermayer2013-11-191-1/+1
|\| | | | | | | | | | | | | | | | | | | | | * 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-181-1/+1
| | | | | | | | data[0] may be NULL for valid frames with hwaccel pixel formats.
* | Merge commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9'Michael Niedermayer2013-11-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | * 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-041-1/+1
| | | | | | | | It's a private field, not meant to be accessed from outside lavc.
* | Merge commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12'Michael Niedermayer2013-11-041-23/+24
|\| | | | | | | | | | | | | | | | | | | | | * 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-041-21/+22
| | | | | | | | | | | | It's a private field, it should not be visible to callers. Deprecate AVCodecContext.thread_opaque
* | Merge commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb'Michael Niedermayer2013-11-041-28/+124
|/ | | | | | | | | | | * 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-041-0/+792