Files
ffmpeg/libavformat
Michael Niedermayer e46cc1dab0 Merge commit '43e7f0797f9f821a3866a20f05e512e13c82076a'
* commit '43e7f0797f9f821a3866a20f05e512e13c82076a':
  flvenc: only write the framerate tag based on avg_frame_rate

Conflicts:
	tests/ref/lavf/flv_fmt
	tests/ref/seek/lavf-flv_fmt
	tests/ref/seek/vsynth2-flv
	tests/ref/vsynth/vsynth1-flashsv
	tests/ref/vsynth/vsynth1-flv
	tests/ref/vsynth/vsynth2-flashsv
	tests/ref/vsynth/vsynth2-flv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29 13:30:12 +02:00
..
2013-12-25 17:14:32 +01:00
2014-05-17 20:13:33 +02:00
2014-05-20 00:00:45 +02:00
2014-04-27 14:50:14 +02:00
2014-05-20 00:00:45 +02:00
2014-04-16 19:41:41 +02:00
2014-04-16 19:41:41 +02:00
2013-12-25 17:38:29 +01:00
2014-04-01 01:13:09 +02:00
2014-04-14 21:40:59 +02:00
2014-04-05 02:18:09 +02:00
2014-04-22 20:44:31 +02:00
2013-12-23 16:28:44 +01:00
2014-03-11 13:22:49 +01:00
2013-12-25 17:38:29 +01:00
2014-05-07 23:39:47 +02:00
2014-05-17 20:13:33 +02:00
2013-11-13 22:56:18 +01:00
2013-12-25 17:38:29 +01:00
2014-04-27 15:14:32 +02:00
2014-05-28 21:51:38 +03:00
2014-04-20 20:56:02 +02:00
2013-12-25 17:38:29 +01:00
2013-12-25 17:38:30 +01:00
2014-04-23 15:10:42 +02:00
2014-03-04 22:54:13 +01:00
2014-05-17 20:13:33 +02:00
2014-03-08 12:36:57 +01:00
2014-05-07 23:39:47 +02:00
2014-04-15 13:51:48 +02:00