ffmpeg/libavcodec/pthread.c at eda6effcabcf9c238e4635eb058d72371336e09b

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-20 14:00:13 +01:00

Files

Michael Niedermayer 117728cf8f Merge commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac'

* commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac':
  pthread_frame: use the AVFrame API properly.

Conflicts:
	libavcodec/pthread_frame.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 45fd4ec9ef)

Conflicts:

	libavcodec/pthread_frame.c
Author of the merged code: Anton Khirnov

2014-01-07 21:28:41 +01:00

38 KiB

Raw Blame History

View Raw

38 KiB Raw Blame History

38 KiB

Raw Blame History