diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-16 21:46:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-16 21:46:02 +0100 |
| commit | 1904704a48b7ced8d5bb9091fe47a28b4bbe619b (patch) | |
| tree | abb8f01d10e35d98037605f34c6978db3f3e7bcd /libavformat/movenc.c | |
| parent | b37852c7d9bc81dface8c8b4143301af914ef9a4 (diff) | |
| parent | faab8f9fcb4ffeb967dc6872c0f1e9da719106ce (diff) | |
| download | ffmpeg-streaming-1904704a48b7ced8d5bb9091fe47a28b4bbe619b.zip ffmpeg-streaming-1904704a48b7ced8d5bb9091fe47a28b4bbe619b.tar.gz | |
Merge commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce'
* commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce':
configure: move cross_compile checks after the toolchain section
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.c')
0 files changed, 0 insertions, 0 deletions
