diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 18:01:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 18:06:39 +0200 |
| commit | 06dae71d477ce0f48d9a8451c710ef13d62abf6c (patch) | |
| tree | 2d35c975113d221ed3d6eb48a7717a04655fe82a /doc/muxers.texi | |
| parent | 5320b34b9853e0c2ce51ee447abe42844e591cda (diff) | |
| parent | 246f869590b8c7313d26e1c2ef56db01f6fd2503 (diff) | |
| download | ffmpeg-06dae71d477ce0f48d9a8451c710ef13d62abf6c.tar.gz | |
Merge commit '246f869590b8c7313d26e1c2ef56db01f6fd2503'
* commit '246f869590b8c7313d26e1c2ef56db01f6fd2503':
vmd: Split audio and video decoder
Conflicts:
libavcodec/vmdvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/muxers.texi')
0 files changed, 0 insertions, 0 deletions