eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 10:00:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
90c02ae1429b7f50cefdaeeca04b51f978cd1921
ffmpeg/libavcodec/h264_direct.c
Michael Niedermayer 266172aaf9 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  w32threads: support for frame multithreading
  avcodec: remove stray @deprecated comment

Conflicts:
	libavcodec/utils.c
	libavcodec/w32thread.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-17 02:29:40 +02:00

26 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink