[FFmpeg-cvslog] Merge commit '4d2d0595cf9dd199c35aefef450952d209a56573'

Michael Niedermayer git at videolan.org
Mon Jul 21 23:23:30 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 21 23:08:41 2014 +0200| [c75c594e5a73a9e0368ff842bc837df3bfb866bd] | committer: Michael Niedermayer

Merge commit '4d2d0595cf9dd199c35aefef450952d209a56573'

* commit '4d2d0595cf9dd199c35aefef450952d209a56573':
  fate: Split audio- and video-related RealMedia targets

Conflicts:
	tests/fate/real.mak

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

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





More information about the ffmpeg-cvslog mailing list