Merge commit '3892bdab9b652eb003ab95e167f1765e0b0ea035'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Apr 2015 22:38:02 +0000 (00:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Apr 2015 22:38:02 +0000 (00:38 +0200)
commit959894632ae67e356ede734e352eabda6bb55794
tree52eaa0f88d733d8fc25ce152fb39f9e907c92f07
parent4d02dfbde475d249916eb19c360e890059aa6aa5
parent3892bdab9b652eb003ab95e167f1765e0b0ea035
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>
ffmpeg.c
ffmpeg_opt.c