ffmpeg | branch: release/2.4 | Michael Niedermayer <michae...@gmx.at> | Sun Apr
5 16:08:29 2015 +0200| [4347cf9f0fc753706d2c507cab6ed67fc0d0eeee] | committer:
Michael Niedermayer
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 <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4347cf9f0fc753706d2c507cab6ed67fc0d0eeee
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
