[FFmpeg-cvslog] Merge commit 'fb7127b2c836b53ad5168887cd12871312c8708d'

Michael Niedermayer git at videolan.org
Mon Mar 24 00:26:43 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 24 00:20:56 2014 +0100| [0dd4eff588c59d0c1412eb4a907004017e76badd] | committer: Michael Niedermayer

Merge commit 'fb7127b2c836b53ad5168887cd12871312c8708d'

* commit 'fb7127b2c836b53ad5168887cd12871312c8708d':
  build: h264 parser depends on full h264 decoder

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0dd4eff588c59d0c1412eb4a907004017e76badd
---





More information about the ffmpeg-cvslog mailing list