diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 01:12:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 01:14:09 +0100 |
| commit | d469fa1923958f98df9d9b0a9cc167248d8516fb (patch) | |
| tree | 5e398fe8703552c62ae9cc550da156fbc9185fab /ffplay.c | |
| parent | cfc1efc77c7a996b3da7c125c43f7c759cb6d144 (diff) | |
| parent | adfa53d67c7a3318157ea9d95e8bdcfb77139452 (diff) | |
| download | ffmpeg-d469fa1923958f98df9d9b0a9cc167248d8516fb.tar.gz | |
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>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions