[FFmpeg-cvslog] Merge commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54'

Michael Niedermayer git at videolan.org
Tue Mar 4 22:00:43 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar  4 21:55:16 2014 +0100| [4a59994e03178878bd22195d4509aea5fd97fc82] | committer: Michael Niedermayer

Merge commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54'

* commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54':
  doc: fix a couple of typos in frame.h

Conflicts:
	libavutil/frame.h

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

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





More information about the ffmpeg-cvslog mailing list