diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-13 21:33:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-13 21:33:13 +0100 |
| commit | 0f242e62b4b4f4da08b4e8e49aa1e4c2900a51f6 (patch) | |
| tree | a6eda1aece06d81dc915478dcef6fedeea3b84c3 /libavformat/asf.h | |
| parent | 1e3718e2a1e70ae13785c566a197552eac7eda39 (diff) | |
| parent | 79d9884e9590c28a0a7ca802a3ba54f2ff4ee423 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: Merge pthreads/w32threads OBJS declarations
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/asf.h')
0 files changed, 0 insertions, 0 deletions