[FFmpeg-cvslog] Merge commit 'a871ef0cc936612bdb0e643196be72efcf0c8986'

Michael Niedermayer git at videolan.org
Sun May 11 23:56:27 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 11 23:49:13 2014 +0200| [fa0f7c024e90a5337892cbc3b78e936ba5d25cf3] | committer: Michael Niedermayer

Merge commit 'a871ef0cc936612bdb0e643196be72efcf0c8986'

* commit 'a871ef0cc936612bdb0e643196be72efcf0c8986':
  hwaccel: Rename priv_data_size to frame_priv_data_size

Conflicts:
	libavcodec/avcodec.h

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

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





More information about the ffmpeg-cvslog mailing list