Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-05-21Fix compilation errors when deprecated features are disabled.Dale Curtis
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19avcodec/pthread_frame: remove unused variableMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19Merge commit '9929b3564c0dca42ed7baa6798ef15b6f0013c83'Michael Niedermayer
* commit '9929b3564c0dca42ed7baa6798ef15b6f0013c83': pthread_frame: simplify the code by using new AVPacket API Conflicts: libavcodec/pthread_frame.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19pthread_frame: simplify the code by using new AVPacket APIAnton Khirnov
This also handles side data properly.
2014-05-12Merge commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8'Michael Niedermayer
* 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>
2014-05-11Merge commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425'Michael Niedermayer
* 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>
2014-05-11lavc: Add hwaccel private data and init/uninit callbacksAnton Khirnov
2014-04-09Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2014-04-09mpegvideo: operate with pointers to AVFrames instead of whole structswm4
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>
2014-04-06avcodec/pthread_frame: fix missing unlock on errorMichael Niedermayer
Fixes CID1197057 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-08lavc/pthread: copy packet side data.Nicolas George
2014-03-01Merge commit 'd1f9563d502037239185c11578cc614bdf0c5870'Michael Niedermayer
* commit 'd1f9563d502037239185c11578cc614bdf0c5870': pthread_frame: flush all threads on flush, not just the first one Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-01pthread_frame: flush all threads on flush, not just the first oneAnton Khirnov
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
2014-01-06Merge commit '9cbf2d78f0a9c19129e7a70b2281a450d386c6d9'Michael Niedermayer
* commit '9cbf2d78f0a9c19129e7a70b2281a450d386c6d9': pthread_frame: unref decoded frames on failure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-06pthread_frame: unref decoded frames on failureAnton Khirnov
This is similar to what the non-threaded code already does. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
2013-12-11avcodec/pthread_frame: Fix memleak of AVCodecContext on errorMichael Niedermayer
Fixes CID1135767 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09Merge commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac'Michael Niedermayer
* commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac': pthread_frame: use the AVFrame API properly. Conflicts: libavcodec/pthread_frame.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09pthread_frame: use the AVFrame API properly.Anton Khirnov
Remove the extended_data workaround, all decoders should now handle this properly.
2013-11-25avcodec/pthread: check packet buffer allocationHendrik Leppkes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19Merge commit 'a553c6a347d3d28d7ee44c3df3d5c4ee780dba23'Michael Niedermayer
* 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>
2013-11-18lavc: use buf[0] instead of data[0] in checks whether a frame is allocatedAnton Khirnov
data[0] may be NULL for valid frames with hwaccel pixel formats.
2013-11-04Merge commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9'Michael Niedermayer
* 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>
2013-11-04Merge commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12'Michael Niedermayer
* 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>
2013-11-04Merge commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb'Michael Niedermayer
* 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>
2013-11-04lavc: move AVCodecContext.pkt to AVCodecInternalAnton Khirnov
It's a private field, not meant to be accessed from outside lavc.
2013-11-04pthread: store thread contexts in AVCodecInternal instead of AVCodecContextAnton Khirnov
It's a private field, it should not be visible to callers. Deprecate AVCodecContext.thread_opaque
2013-11-04lavc: split slice and frame threading functions into separate filesAnton Khirnov