diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-25 12:39:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-25 12:39:23 +0100 |
| commit | 2c0b246b5babc51ac9b7b21a2c88c32d01993efc (patch) | |
| tree | d95edc054d2d6e978c46f5b1dd72f87bb8cbae3c /presets | |
| parent | 459db51271807ba26162db7b67ac1ff444cc0fa9 (diff) | |
| parent | d06ca2040c0f30345b4aa8e83d824297535953c5 (diff) | |
| download | ffmpeg-2c0b246b5babc51ac9b7b21a2c88c32d01993efc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
error.h: Do not circularly depend on avutil.h
See: 7c2bb79f3b849d12800856379063f99f3b018678
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets')
0 files changed, 0 insertions, 0 deletions