[FFmpeg-cvslog] Merge commit 'adfa53d67c7a3318157ea9d95e8bdcfb77139452'
Michael Niedermayer
git at videolan.org
Wed Mar 13 01:21:46 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 13 01:12:57 2013 +0100| [d469fa1923958f98df9d9b0a9cc167248d8516fb] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d469fa1923958f98df9d9b0a9cc167248d8516fb
---
More information about the ffmpeg-cvslog
mailing list