1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavformat
Michael Niedermayer 3f2f87cd5a Merge commit '74bc9458057f07c0820c3d3264396c4c64442e47'
* commit '74bc9458057f07c0820c3d3264396c4c64442e47':
  flvenc: Don't over-count metadata.

Conflicts:
	tests/ref/lavf/flv_fmt
	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-06-18 01:44:24 +02:00
..
2013-12-25 17:14:32 +01:00
2014-06-03 10:58:19 -08:00
2014-05-17 20:13:33 +02:00
2014-06-03 10:58:19 -08:00
2014-05-20 00:00:45 +02:00
2014-06-03 10:58:19 -08:00
2014-05-20 00:00:45 +02:00
2014-06-03 10:58:19 -08: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
2014-06-03 10:58:19 -08:00
2014-05-07 23:39:47 +02:00
2014-05-17 20:13:33 +02:00
2013-12-25 17:38:29 +01:00
2014-04-27 15:14:32 +02: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-03-04 22:54:13 +01:00
2014-03-08 12:36:57 +01:00
2014-05-07 23:39:47 +02:00
2014-06-07 14:43:07 +02:00
2014-04-15 13:51:48 +02:00