diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-02 00:34:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-02 00:34:24 +0200 |
| commit | 03b2b40fd7f010fc245d36c05c7439c058b927bf (patch) | |
| tree | 7b50d24beddf2544c6f51a0a078950a7673565c0 /libavutil/avr32 | |
| parent | 838c5f3df7e98b15fd3acbcacaf315c32600ca45 (diff) | |
| parent | a31c4b2cbef9aee15910fc3df52519aef46760de (diff) | |
| download | ffmpeg-03b2b40fd7f010fc245d36c05c7439c058b927bf.tar.gz | |
Merge commit 'a31c4b2cbef9aee15910fc3df52519aef46760de'
* commit 'a31c4b2cbef9aee15910fc3df52519aef46760de':
fate-g2m3: disable the audio stream
Conflicts:
tests/ref/fate/g2m3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/avr32')
0 files changed, 0 insertions, 0 deletions