1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00
Michael Niedermayer ac293b6685 Merge commit '194be1f43ea391eb986732707435176e579265aa'
* commit '194be1f43ea391eb986732707435176e579265aa':
  lavf: switch to AVStream.time_base as the hint for the muxer timebase

Conflicts:
	doc/APIchanges
	libavformat/filmstripenc.c
	libavformat/movenc.c
	libavformat/mxfenc.c
	libavformat/oggenc.c
	libavformat/swf.h
	libavformat/version.h
	tests/ref/lavf/mkv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18 19:49:17 +02:00
2014-06-18 14:55:28 +02:00
2014-06-18 14:55:28 +02:00
2014-05-28 03:52:50 +02:00
2014-06-18 14:55:28 +02:00
2014-06-17 17:31:29 +02:00
2014-05-28 22:38:38 +02:00
2014-05-28 22:38:28 +02:00
2014-06-18 14:55:28 +02:00
2014-05-28 22:38:11 +02:00
2014-03-13 08:24:11 -04:00

FFmpeg README

  1. Documentation

  1. Licensing

  • See the LICENSE file.
  1. Build and Install

  • See the INSTALL file.
Languages
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.1%
Other 0.1%