diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-17 15:36:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-17 15:46:08 +0200 |
| commit | df5e089da95bc39b71f9cbee4152636758dc2041 (patch) | |
| tree | b9f7f8ffecf54b1586a78236f52d1a4674a9c562 /libavfilter/vsink_nullsink.c | |
| parent | d8cfa983580402787e06093da8d242cd92a74428 (diff) | |
| parent | 31c54711cc3f1484af101d629bbb805820d37ad1 (diff) | |
| download | ffmpeg-df5e089da95bc39b71f9cbee4152636758dc2041.tar.gz | |
Merge commit '31c54711cc3f1484af101d629bbb805820d37ad1'
* commit '31c54711cc3f1484af101d629bbb805820d37ad1':
lavf: split wav muxer and demuxer into separate files.
Conflicts:
libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vsink_nullsink.c')
0 files changed, 0 insertions, 0 deletions