diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 12:17:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 12:17:10 +0200 |
| commit | b189c699b98cc2c563e6e9778013d3753476ed1e (patch) | |
| tree | 700011dffd0ffc2ff6a70dc2e5abd5f5b39ddd5e /libavutil/adler32.h | |
| parent | 03e9506aae31d012ab822722c43b40b8d4a191a8 (diff) | |
| parent | 187023f6b2b43966acb2449a379b4ededdc4b22e (diff) | |
| download | ffmpeg-b189c699b98cc2c563e6e9778013d3753476ed1e.tar.gz | |
Merge commit '187023f6b2b43966acb2449a379b4ededdc4b22e'
* commit '187023f6b2b43966acb2449a379b4ededdc4b22e':
movenc: Set mov->mode earlier in mov_write_header
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/adler32.h')
0 files changed, 0 insertions, 0 deletions