diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 00:38:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 00:38:02 +0200 |
| commit | 959894632ae67e356ede734e352eabda6bb55794 (patch) | |
| tree | 52eaa0f88d733d8fc25ce152fb39f9e907c92f07 /libavformat/ipmovie.c | |
| parent | 4d02dfbde475d249916eb19c360e890059aa6aa5 (diff) | |
| parent | 3892bdab9b652eb003ab95e167f1765e0b0ea035 (diff) | |
| download | ffmpeg-959894632ae67e356ede734e352eabda6bb55794.tar.gz | |
Merge commit '3892bdab9b652eb003ab95e167f1765e0b0ea035'
* commit '3892bdab9b652eb003ab95e167f1765e0b0ea035':
avconv: do not overwrite the stream codec context for streamcopy
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ipmovie.c')
0 files changed, 0 insertions, 0 deletions