[FFmpeg-cvslog] Merge commit '8d695dc411c1ae28477f107d6f7bf2db59af95df'

Michael Niedermayer git at videolan.org
Mon Jun 23 01:03:28 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 23 00:57:41 2014 +0200| [412015694c083ccbd5f66ffd8b078f53e8a6ab6a] | committer: Michael Niedermayer

Merge commit '8d695dc411c1ae28477f107d6f7bf2db59af95df'

* commit '8d695dc411c1ae28477f107d6f7bf2db59af95df':
  mpeg: Mark ff_mpeg_set_erpic() static

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

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





More information about the ffmpeg-cvslog mailing list