1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +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
..
ast
au
bmp
caf
dpx
ffm
2014-06-18 14:55:28 +02:00
flm
2014-06-17 21:38:21 +02:00
gif
jpg
mmf
mpg
ogg
2014-05-28 21:51:38 +03:00
pam
pcx
pgm
png
ppm
rm
rso
sgi
sox
swf
tga
voc
w64
wav
xbm
xwd