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
..
bmp
2013-04-30 11:53:12 +02:00
ffm
2014-06-18 14:55:28 +02:00
flm
2012-11-03 22:47:14 +01:00
2014-06-17 21:38:21 +02:00
gif
2014-04-28 15:20:38 +02:00
jpg
2013-04-30 11:53:12 +02:00
ogg
2014-05-28 21:51:38 +03:00
pam
2014-03-18 22:15:15 +01:00
pcx
2013-04-30 11:53:12 +02:00
png
2014-03-18 22:15:15 +01:00
ppm
2013-04-30 11:53:12 +02:00
sgi
2013-04-30 11:53:12 +02:00
swf
tga
2013-04-30 11:53:12 +02:00
xbm