summaryrefslogtreecommitdiff
path: root/libavcodec/vmdaudio.c
Commit message (Collapse)AuthorAge
* Correct few "ffmpeg" typosPaul B Mahol2014-08-24
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* Merge commit '246f869590b8c7313d26e1c2ef56db01f6fd2503'Michael Niedermayer2014-07-07
| | | | | | | | | | * commit '246f869590b8c7313d26e1c2ef56db01f6fd2503': vmd: Split audio and video decoder Conflicts: libavcodec/vmdvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* vmd: Split audio and video decoderNidhi Makhijani2014-07-07
Signed-off-by: Diego Biurrun <diego@biurrun.de>