RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

AMV demuxer and audio/video decoder 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24673 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
voroshil 2007-09-30 03:49:22 +00:00
parent 465cc5fb0e
commit 2b9b873707
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@ -84,6 +84,7 @@ MPlayer (1.0)
* Matroska muxer * Matroska muxer
* Monkey's Audio demuxer and decoder * Monkey's Audio demuxer and decoder
* Flac encoder and decoder speedups * Flac encoder and decoder speedups
* AMV demuxer and audio/video decoder
libmpeg2: libmpeg2:
* iWMMXt-accelerated DCT and motion compensation for ARM processors * iWMMXt-accelerated DCT and motion compensation for ARM processors

17
etc/codecs.conf
View File

@ -3,7 +3,7 @@
; Before editing this file, please read DOCS/tech/codecs.conf.txt ! ; Before editing this file, please read DOCS/tech/codecs.conf.txt !
;============================================================================= ;=============================================================================
release 20070511 release 20070930
;============================================================================= ;=============================================================================
; VIDEO CODECS ; VIDEO CODECS
@ -1598,6 +1598,14 @@ videocodec tm20
guid 0x4cb63e61, 0xc611, 0x11D0, 0x83, 0xaa, 0x00, 0x00, 0x92, 0x90, 0x01, 0x84 guid 0x4cb63e61, 0xc611, 0x11D0, 0x83, 0xaa, 0x00, 0x00, 0x92, 0x90, 0x01, 0x84
out BGR32,BGR24,BGR16 flip out BGR32,BGR24,BGR16 flip
videocodec ffamv
info "Modified MJPEG, used in AMV files"
status working
fourcc AMVV ; internal MPlayer FourCC
driver ffmpeg
dll "amv"
out YV12
videocodec ffsp5x videocodec ffsp5x
info "SP5x codec - used by Aiptek MegaCam" info "SP5x codec - used by Aiptek MegaCam"
status working status working
@ -2564,6 +2572,13 @@ audiocodec raatrcmac
driver realaud driver realaud
dll "atrc.bundle/Contents/MacOS/atrc" dll "atrc.bundle/Contents/MacOS/atrc"
audiocodec ffadpcmimaamv
info "FFmpeg AMV IMA ADPCM audio"
status working
format 0x01
driver ffmpeg
dll adpcm_ima_amv
audiocodec imaadpcm audiocodec imaadpcm
info "IMA ADPCM" info "IMA ADPCM"
status working status working

1
libmpdemux/demux_lavf.c
View File

@ -99,6 +99,7 @@ static const AVCodecTag mp_wav_tags[] = {
const struct AVCodecTag *mp_wav_taglists[] = {codec_wav_tags, mp_wav_tags, 0}; const struct AVCodecTag *mp_wav_taglists[] = {codec_wav_tags, mp_wav_tags, 0};
static const AVCodecTag mp_bmp_tags[] = { static const AVCodecTag mp_bmp_tags[] = {
{ CODEC_ID_AMV, MKTAG('A', 'M', 'V', 'V')},
{ CODEC_ID_BETHSOFTVID, MKTAG('B', 'E', 'T', 'H')}, { CODEC_ID_BETHSOFTVID, MKTAG('B', 'E', 'T', 'H')},
{ CODEC_ID_C93, MKTAG('C', '9', '3', 'V')}, { CODEC_ID_C93, MKTAG('C', '9', '3', 'V')},
{ CODEC_ID_DSICINVIDEO, MKTAG('D', 'C', 'I', 'V')}, { CODEC_ID_DSICINVIDEO, MKTAG('D', 'C', 'I', 'V')},