[FFmpeg-cvslog] Merge commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443'
Michael Niedermayer
git at videolan.org
Thu Jun 26 21:00:56 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 26 20:56:23 2014 +0200| [a9f7972844b70c8e94520f52080884bb1507171f] | committer: Michael Niedermayer
Merge commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443'
* commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443':
lavc: do not allocate edges in the default get_buffer2()
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a9f7972844b70c8e94520f52080884bb1507171f
---
More information about the ffmpeg-cvslog
mailing list