eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
60283 commits 37 branches 405 tags 511 MiB
Commit graph

14 commits

Author SHA1 Message Date
Michael Niedermayer
8367bc6be8 Merge commit '9cbf2d78f0' 
* commit '9cbf2d78f0':
  pthread_frame: unref decoded frames on failure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-06 17:01:20 +01:00
Anton Khirnov
9cbf2d78f0 pthread_frame: unref decoded frames on failure 
This is similar to what the non-threaded code already does.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2014-01-06 08:25:55 +01:00
Michael Niedermayer
11679e1b90 avcodec/pthread_frame: Fix memleak of AVCodecContext on error 
Fixes CID1135767
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-11 00:27:09 +01:00
Michael Niedermayer
45fd4ec9ef Merge commit 'd351ef47d0' 
* commit 'd351ef47d0':
  pthread_frame: use the AVFrame API properly.

Conflicts:
	libavcodec/pthread_frame.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-09 13:25:17 +01:00
Anton Khirnov
d351ef47d0 pthread_frame: use the AVFrame API properly. 
Remove the extended_data workaround, all decoders should now handle this
properly.
 2013-12-09 08:42:25 +01:00
Hendrik Leppkes
841c0aafa5 avcodec/pthread: check packet buffer allocation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-25 02:22:43 +01:00
Michael Niedermayer
56e122787e Merge commit 'a553c6a347' 
* commit 'a553c6a347':
  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-19 03:56:53 +01:00
Anton Khirnov
a553c6a347 lavc: use buf[0] instead of data[0] in checks whether a frame is allocated 
data[0] may be NULL for valid frames with hwaccel pixel formats.
 2013-11-18 18:09:48 +01:00
Michael Niedermayer
ab71be0912 Merge commit 'da6506c607' 
* commit 'da6506c607':
  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-04 11:41:55 +01:00
Michael Niedermayer
3fc26d8073 Merge commit '38ecc3702d' 
* commit '38ecc3702d':
  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-04 11:14:38 +01:00
Michael Niedermayer
4eea41cba1 Merge commit 'cc14ee03a7' 
* commit 'cc14ee03a7':
  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-04 10:44:34 +01:00
Anton Khirnov
da6506c607 lavc: move AVCodecContext.pkt to AVCodecInternal 
It's a private field, not meant to be accessed from outside lavc.
 2013-11-04 08:51:26 +01:00
Anton Khirnov
38ecc3702d pthread: store thread contexts in AVCodecInternal instead of AVCodecContext 
It's a private field, it should not be visible to callers.

Deprecate AVCodecContext.thread_opaque
 2013-11-04 08:51:26 +01:00
Anton Khirnov
cc14ee03a7 lavc: split slice and frame threading functions into separate files 2013-11-04 08:51:26 +01:00