breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
ff99b42e045a0b40bf81e4e38e6ef86f4db32006
FFmpeg/libavcodec/vda.h
Michael Niedermayer d469fa1923 Merge commit 'adfa53d67c7a3318157ea9d95e8bdcfb77139452' 
* commit 'adfa53d67c7a3318157ea9d95e8bdcfb77139452':
  lavc: remove disabled FF_API_VDA_ASYNC cruft

Conflicts:
	libavcodec/vda.h
	libavcodec/vda_h264.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 01:14:09 +01:00

3.5 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink