generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
042a82ca37
ffmpeg/tests/ref
History
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
..
acodec adpcm: Write the proper predictor in trellis mode in IMA QT 2014-06-06 17:08:21 +02:00
fate avcodec/ass: move playres parameters below scripttype 2014-06-18 18:43:36 +02:00
lavf Merge commit '194be1f43ea391eb986732707435176e579265aa' 2014-06-18 19:49:17 +02:00
lavf-fate avformat/oggenc: fix EOS flag 2014-05-28 01:12:18 +02:00
seek Remove avserver. 2014-06-18 14:55:28 +02:00
vsynth flvenc: Don't over-count metadata. 2014-06-17 21:38:21 +02:00
vsynth1 Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725' 2012-05-30 01:40:54 +02:00
vsynth2 Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725' 2012-05-30 01:40:54 +02:00