diff options
| -rw-r--r-- | src/libffmpeg/audio_decoder.c | 6 | ||||
| -rw-r--r-- | src/libffmpeg/video_decoder.c | 22 | ||||
| -rw-r--r-- | src/libffmpeg/xine_decoder.c | 12 |
3 files changed, 35 insertions, 5 deletions
diff --git a/src/libffmpeg/audio_decoder.c b/src/libffmpeg/audio_decoder.c index 857bfad74..4aa353171 100644 --- a/src/libffmpeg/audio_decoder.c +++ b/src/libffmpeg/audio_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_decoder.c,v 1.13 2005/03/06 07:15:05 tmmm Exp $ + * $Id: audio_decoder.c,v 1.14 2005/04/19 05:22:52 tmmm Exp $ * * xine audio decoder plugin using ffmpeg * @@ -99,7 +99,8 @@ static const ff_codec_t ff_audio_lookup[] = { {BUF_AUDIO_MAC6, CODEC_ID_MACE6, "MACE 6:1 (ffmpeg)"}, {BUF_AUDIO_XAN_DPCM, CODEC_ID_XAN_DPCM, "Origin Xan DPCM (ffmpeg)"}, {BUF_AUDIO_VMD, CODEC_ID_VMDAUDIO, "Sierra VMD Audio (ffmpeg)"}, - {BUF_AUDIO_FLAC, CODEC_ID_FLAC, "FLAC (ffmpeg)"} }; + {BUF_AUDIO_FLAC, CODEC_ID_FLAC, "FLAC (ffmpeg)"}, + {BUF_AUDIO_ALAC, CODEC_ID_ALAC, "ALAC (ffmpeg)"} }; static void ff_audio_ensure_buffer_size(ff_audio_decoder_t *this, int size) { @@ -434,6 +435,7 @@ static uint32_t supported_audio_types[] = { BUF_AUDIO_EA_ADPCM, BUF_AUDIO_SMJPEG_IMA, BUF_AUDIO_FLAC, + BUF_AUDIO_ALAC, /* BUF_AUDIO_MPEG, */ 0 }; diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c index 350db4a4a..ed9b626fb 100644 --- a/src/libffmpeg/video_decoder.c +++ b/src/libffmpeg/video_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_decoder.c,v 1.40 2005/04/16 23:38:09 hadess Exp $ + * $Id: video_decoder.c,v 1.41 2005/04/19 05:22:53 tmmm Exp $ * * xine video decoder plugin using ffmpeg * @@ -706,7 +706,16 @@ static const ff_codec_t ff_video_lookup[] = { {BUF_VIDEO_ATIVCR1, CODEC_ID_VCR1, "ATI VCR-1 (ffmpeg)"}, {BUF_VIDEO_FLV1, CODEC_ID_FLV1, "Flash Video (ffmpeg)"}, {BUF_VIDEO_QTRLE, CODEC_ID_QTRLE, "Apple Quicktime Animation/RLE (ffmpeg)"}, - {BUF_VIDEO_H264, CODEC_ID_H264, "H.264/AVC (ffmpeg)"} }; + {BUF_VIDEO_H264, CODEC_ID_H264, "H.264/AVC (ffmpeg)"}, + {BUF_VIDEO_H261, CODEC_ID_H261, "H.261 (ffmpeg)"}, + {BUF_VIDEO_AASC, CODEC_ID_AASC, "Autodesk Video (ffmpeg)"}, + {BUF_VIDEO_LOCO, CODEC_ID_LOCO, "LOCO (ffmpeg)"}, + {BUF_VIDEO_QDRW, CODEC_ID_QDRAW, "QuickDraw (ffmpeg)"}, + {BUF_VIDEO_QPEG, CODEC_ID_QPEG, "Q-Team QPEG (ffmpeg)"}, + {BUF_VIDEO_TSCC, CODEC_ID_TSCC, "TechSmith Video (ffmpeg)"}, + {BUF_VIDEO_ULTI, CODEC_ID_ULTI, "IBM UltiMotion (ffmpeg)"}, + {BUF_VIDEO_WNV1, CODEC_ID_WNV1, "Winnow Video (ffmpeg)"}, + {BUF_VIDEO_XL, CODEC_ID_VIXL, "Miro/Pinnacle VideoXL (ffmpeg)"} }; static void ff_check_bufsize (ff_video_decoder_t *this, int size) { if (size > this->bufsize) { @@ -1330,6 +1339,15 @@ static uint32_t supported_video_types[] = { BUF_VIDEO_FLV1, BUF_VIDEO_QTRLE, BUF_VIDEO_H264, + BUF_VIDEO_H261, + BUF_VIDEO_AASC, + BUF_VIDEO_LOCO, + BUF_VIDEO_QDRW, + BUF_VIDEO_QPEG, + BUF_VIDEO_TSCC, + BUF_VIDEO_ULTI, + BUF_VIDEO_WNV1, + BUF_VIDEO_XL, 0 }; diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c index 9071c118e..b470bfdd8 100644 --- a/src/libffmpeg/xine_decoder.c +++ b/src/libffmpeg/xine_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.160 2004/06/10 04:46:18 tmmm Exp $ + * $Id: xine_decoder.c,v 1.161 2005/04/19 05:22:54 tmmm Exp $ * * xine decoder plugin using ffmpeg * @@ -115,6 +115,16 @@ void avcodec_register_all(void) register_avcodec(&flv_decoder); register_avcodec(&qtrle_decoder); register_avcodec(&flac_decoder); + register_avcodec(&aasc_decoder); + register_avcodec(&alac_decoder); + register_avcodec(&h261_decoder); + register_avcodec(&loco_decoder); + register_avcodec(&qdraw_decoder); + register_avcodec(&qpeg_decoder); + register_avcodec(&tscc_decoder); + register_avcodec(&ulti_decoder); + register_avcodec(&wnv1_decoder); + register_avcodec(&xl_decoder); } void init_once_routine(void) { |