diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-21 23:08:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-21 23:08:41 +0200 |
| commit | c75c594e5a73a9e0368ff842bc837df3bfb866bd (patch) | |
| tree | a736bea26bcfc7f1990a7c94792b1399ec053d5b /libavformat/iff.c | |
| parent | 16c66f3151cfe54622492125b4c7654078582f96 (diff) | |
| parent | 4d2d0595cf9dd199c35aefef450952d209a56573 (diff) | |
| download | ffmpeg-c75c594e5a73a9e0368ff842bc837df3bfb866bd.tar.gz | |
Merge commit '4d2d0595cf9dd199c35aefef450952d209a56573'
* commit '4d2d0595cf9dd199c35aefef450952d209a56573':
fate: Split audio- and video-related RealMedia targets
Conflicts:
tests/fate/real.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/iff.c')
0 files changed, 0 insertions, 0 deletions