1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavformat
Michael Niedermayer 31dfe20dd2 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  doc: Replace some @file tags by more suitable markup.
  fate: Set FUZZ factor of vorbis-13 test to 2.
  fate: Set FUZZ factor of (e)ac3-encode test to 3.
  fate: remove unused code from regressions-funcs.sh
  rtmp: Don't assume path points to a string of nonzero length
  avconv: fix behavior with -ss as an output option.

Conflicts:
	doc/platform.texi
	doc/protocols.texi
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-19 00:52:25 +02:00
..
2012-04-16 15:27:39 +02:00
2012-04-19 22:52:34 +02:00
2012-04-28 16:39:54 +02:00
2012-05-10 04:17:03 +02:00
2012-05-07 02:42:00 +02:00
2012-05-01 23:20:52 +02:00
2012-04-06 08:32:09 +02:00
2012-03-30 05:16:15 +02:00
2012-05-08 08:41:26 +02:00
2012-03-31 12:37:42 +02:00
2012-05-08 03:47:58 +02:00
2012-05-15 11:16:34 +02:00
2012-04-19 15:08:13 +02:00
2012-05-08 10:37:13 +02:00
2012-04-18 15:30:34 +02:00
2012-05-18 23:34:11 +02:00
2012-04-03 19:12:52 +02:00