1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
Michael Niedermayer 03b2b40fd7 Merge commit 'a31c4b2cbef9aee15910fc3df52519aef46760de'
* commit 'a31c4b2cbef9aee15910fc3df52519aef46760de':
  fate-g2m3: disable the audio stream

Conflicts:
	tests/ref/fate/g2m3

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-02 00:34:24 +02:00
..
2015-04-12 00:15:58 +02:00
2015-06-26 14:39:11 +02:00
2015-04-02 23:15:57 +02:00
2015-04-23 12:56:31 +02:00
2015-05-07 07:19:49 -04:00