diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-02 18:48:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-02 18:48:56 +0200 |
| commit | dd78e1090b4cae3fbaa71e266c4b6b2f82ea9b7c (patch) | |
| tree | 18259ca73351256eb40623d0c1cc320d9c04c1aa /libswresample/libswresample.v | |
| parent | 6cbbf4a274d42f92cdd2e98e83e95e23cbfbf976 (diff) | |
| parent | 1e46c63eb72be752e044ba32257d77f35cbd9dac (diff) | |
| download | ffmpeg-dd78e1090b4cae3fbaa71e266c4b6b2f82ea9b7c.tar.gz | |
Merge commit '1e46c63eb72be752e044ba32257d77f35cbd9dac'
* commit '1e46c63eb72be752e044ba32257d77f35cbd9dac':
avformat: refactor avformat_write_header
Conflicts:
libavformat/mux.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/libswresample.v')
0 files changed, 0 insertions, 0 deletions