diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-21 16:55:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-21 16:55:39 +0200 |
| commit | be0fd074579cd50149a0cff88111bf1b6efb310a (patch) | |
| tree | fd33b47f57afbe623172d56523594e7bdd2f79d4 /libavformat/async.c | |
| parent | 593731efa8eebf2dac3d1e751ccce90173b3097f (diff) | |
| parent | 219b39a71a5694b1c14a07b86477f665a5b6849b (diff) | |
Merge commit '219b39a71a5694b1c14a07b86477f665a5b6849b'
* commit '219b39a71a5694b1c14a07b86477f665a5b6849b':
parseutil: Use non ambiguous aliases for uhd
Conflicts:
doc/ffmpeg.texi
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/async.c')
0 files changed, 0 insertions, 0 deletions