[FFmpeg-cvslog] Merge commit '746dca483a2f0f2639265f6e1c0085c8861875a1'

Michael Niedermayer git at videolan.org
Mon Feb 24 09:20:14 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 24 08:53:13 2014 +0100| [cc6cc84bc4e009b08ae2f4c2206920e2963adc52] | committer: Michael Niedermayer

Merge commit '746dca483a2f0f2639265f6e1c0085c8861875a1'

* commit '746dca483a2f0f2639265f6e1c0085c8861875a1':
  avconv: support forcing codec tags for input streams

Conflicts:
	doc/ffmpeg.texi

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

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





More information about the ffmpeg-cvslog mailing list