Merge commit '420aa06a2487469259a04f9be66fd15535372796' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Apr 2015 14:08:29 +0000 (16:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Apr 2015 14:08:29 +0000 (16:08 +0200)
commit4347cf9f0fc753706d2c507cab6ed67fc0d0eeee
treef9305b0598d95dd4b48be1d69a388b508bc0f659
parent17b27a7cbe26c790a5ef2967c04a7f5e2add8b93
parent420aa06a2487469259a04f9be66fd15535372796
Merge commit '420aa06a2487469259a04f9be66fd15535372796' into release/2.4

* commit '420aa06a2487469259a04f9be66fd15535372796':
  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