[FFmpeg-cvslog] Merge remote-tracking branch 'cehoyos/master'

Michael Niedermayer git at videolan.org
Fri Apr 25 02:12:51 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 25 01:56:15 2014 +0200| [e148a5820dc5e7077f519d091b5e1ff2a5b23665] | committer: Michael Niedermayer

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Enable muxing ac-3 in caf.
  Use correct msvc type specifiers for ptrdiff_t and size_t.
  Fix vf_eq.c and vf_eq2.c compilation with !HAVE_6REGS.
  Fix libpostproc compilation with !HAVE_6REGS.
  Never write 0 as maximum bitrate for asf files.

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

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





More information about the ffmpeg-cvslog mailing list