diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-01 10:16:42 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-01 10:16:42 +0200 |
commit | b919a8d3a38559bb5f60a66839ca6f3358b1c908 (patch) | |
tree | 8995cd60f4a4e2d226e43c25445084833b005dbd /libavformat/movenc.h | |
parent | 716dbc7e13c101e6512d7282634051f48e8f345e (diff) | |
parent | 14fb9d3d8ccf5f50180aabdb1afe8b570fea3d28 (diff) | |
download | ffmpeg-b919a8d3a38559bb5f60a66839ca6f3358b1c908.tar.gz |
Merge commit '14fb9d3d8ccf5f50180aabdb1afe8b570fea3d28'
* commit '14fb9d3d8ccf5f50180aabdb1afe8b570fea3d28':
configure: Separate commonalities in msvc and icl flags
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.h')
0 files changed, 0 insertions, 0 deletions