# HG changeset patch # User cehoyos # Date 1351596725 0 # Node ID 130cdc6e5a00866eae0afae8a71a46035e3f0b17 # Parent dff978cf2aa9fef78707168b50ae5ab4b06fea87 Support FFmpeg YOP decoder. diff -r dff978cf2aa9 -r 130cdc6e5a00 etc/codecs.conf --- a/etc/codecs.conf Sun Oct 28 20:55:47 2012 +0000 +++ b/etc/codecs.conf Tue Oct 30 11:32:05 2012 +0000 @@ -724,6 +724,14 @@ dll sunrast out BGR24,BGR8,Y800,RGB24,RGBA,BGRA +videocodec ffyop + info "FFmpeg Psygnosis YOP" + status working + fourcc YOP1 + driver ffmpeg + dll yop + out BGR8 + videocodec ffindeo3 info "FFmpeg Intel Indeo 3.1/3.2" status working diff -r dff978cf2aa9 -r 130cdc6e5a00 libmpdemux/mp_taglists.c --- a/libmpdemux/mp_taglists.c Sun Oct 28 20:55:47 2012 +0000 +++ b/libmpdemux/mp_taglists.c Tue Oct 30 11:32:05 2012 +0000 @@ -170,6 +170,7 @@ { CODEC_ID_VMDVIDEO, MKTAG('V', 'M', 'D', 'V')}, { CODEC_ID_WS_VQA, MKTAG('V', 'Q', 'A', 'V')}, { CODEC_ID_XAN_WC3, MKTAG('W', 'C', '3', 'V')}, + { CODEC_ID_YOP, MKTAG('Y', 'O', 'P', '1')}, { 0, 0 }, };