diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 15:12:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 15:12:20 +0200 |
| commit | 4d54ecf4b8e897e993911ff51d53f52de88f29d5 (patch) | |
| tree | d1650172fb50f9e7c488a1e5d4d8ee3a19acd4e2 /ffmpeg.h | |
| parent | 79ec524ff52aa641896f755b63e933ab2877763c (diff) | |
| parent | a1f6ad69c77917a348650a745752535503a44f88 (diff) | |
| download | ffmpeg-4d54ecf4b8e897e993911ff51d53f52de88f29d5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: check that dependencies actually exist
fate: fix ENCMUX macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions