opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-03-13 09:00:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
10ece44d0948b44b062d09319052d09d14f7bfdb
FFmpeg/libavcodec/pthread.c
Michael Niedermayer ace0cfea60 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  hwaccel: fix use with frame based multithreading

Conflicts:
	libavcodec/h263dec.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-27 11:51:33 +01:00

35 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink