[FFmpeg-cvslog] Merge commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b'

Michael Niedermayer git at videolan.org
Sat Jan 19 13:07:52 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 19 13:01:06 2013 +0100| [1b03e09198e5db75064b202e00bd77f84fa47063] | committer: Michael Niedermayer

Merge commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b'

* commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b':
  x86inc: Rename "program_name" to "private_prefix"
  configure: Run SHFLAGS through ldflags_filter()

Conflicts:
	configure

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

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





More information about the ffmpeg-cvslog mailing list