[FFmpeg-cvslog] Merge commit 'd754ed41727b1fcbab335b510248a9758a73320c'
Michael Niedermayer
git at videolan.org
Wed Jun 18 17:53:58 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 18 17:47:12 2014 +0200| [2d70282254834b276ab5eea44dba694f98551c79] | committer: Michael Niedermayer
Merge commit 'd754ed41727b1fcbab335b510248a9758a73320c'
* commit 'd754ed41727b1fcbab335b510248a9758a73320c':
riffenc: take an AVStream instead of an AVCodecContext
Conflicts:
libavformat/nutenc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d70282254834b276ab5eea44dba694f98551c79
---
More information about the ffmpeg-cvslog
mailing list