diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-12 14:10:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-12 14:10:36 +0100 |
| commit | a63dc846b502462c724c4791f830878301b0277a (patch) | |
| tree | 0750587022235543da53b185169cccb63a25b3f8 /compat | |
| parent | 08db519e1275d301417be0013ef3eb03e9381935 (diff) | |
| parent | fd1abf42693308ff99b9473c2387d5142f8b3f0e (diff) | |
| download | ffmpeg-a63dc846b502462c724c4791f830878301b0277a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavu: avoid clashing definition of E
doc: developer: Add a note about reserved system name space
Conflicts:
libavutil/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'compat')
0 files changed, 0 insertions, 0 deletions