[FFmpeg-cvslog] Merge commit 'b03b2d86aa9d79670825b42d8a8a7c41f59cb444'
Michael Niedermayer
git at videolan.org
Tue May 27 03:22:29 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 27 03:12:49 2014 +0200| [50ffd8439c9306a761a279d470564ad9688e3689] | committer: Michael Niedermayer
Merge commit 'b03b2d86aa9d79670825b42d8a8a7c41f59cb444'
* commit 'b03b2d86aa9d79670825b42d8a8a7c41f59cb444':
buffersrc: avoid using AV_PIX_FMT_NB
Conflicts:
libavfilter/buffersrc.c
No change as AV_PIX_FMT_NB was not used by our buffersrc.c
See: 0d58bbb28d90a16bdb0ece6f5c67e12167a67a0f
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=50ffd8439c9306a761a279d470564ad9688e3689
---
More information about the ffmpeg-cvslog
mailing list