[FFmpeg-cvslog] Merge commit '91767360d86ac786571593ab11c7291010ab3829'
Michael Niedermayer
git at videolan.org
Mon Jul 20 21:52:06 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Jul 20 21:40:34 2015 +0200| [a99f0ad194fd48ae8afd9264595b7ca6f45e2a8a] | committer: Michael Niedermayer
Merge commit '91767360d86ac786571593ab11c7291010ab3829'
* commit '91767360d86ac786571593ab11c7291010ab3829':
a64multienc: Do not entangle coded_frame
Conflicts:
libavcodec/a64multienc.c
Merged-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a99f0ad194fd48ae8afd9264595b7ca6f45e2a8a
---
More information about the ffmpeg-cvslog
mailing list