[FFmpeg-cvslog] Merge commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5'
Michael Niedermayer
git at videolan.org
Sun Jun 1 15:31:33 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 1 14:35:53 2014 +0200| [d09793576760c3f6894007184875a158b7be2347] | committer: Michael Niedermayer
Merge commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5'
* commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5':
avconv: do not use the stream codec context for decoding
Conflicts:
ffmpeg.c
ffmpeg_filter.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d09793576760c3f6894007184875a158b7be2347
---
More information about the ffmpeg-cvslog
mailing list