[FFmpeg-cvslog] Merge commit '3892bdab9b652eb003ab95e167f1765e0b0ea035'

Michael Niedermayer git at videolan.org
Sat Apr 4 00:47:38 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr  4 00:38:02 2015 +0200| [959894632ae67e356ede734e352eabda6bb55794] | committer: Michael Niedermayer

Merge commit '3892bdab9b652eb003ab95e167f1765e0b0ea035'

* commit '3892bdab9b652eb003ab95e167f1765e0b0ea035':
  avconv: do not overwrite the stream codec context for streamcopy

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=959894632ae67e356ede734e352eabda6bb55794
---





More information about the ffmpeg-cvslog mailing list