summaryrefslogtreecommitdiff
path: root/src/libffmpeg/xine_decoder.c
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2002-11-15 00:20:31 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2002-11-15 00:20:31 +0000
commiteca1bc92a62d5ad690080f4950c9b58c3989f26b (patch)
treeaa75375f61771133fd1f22c9da292edc647ab4ca /src/libffmpeg/xine_decoder.c
parent69d8b3e79218ae27e289889fb0e2617c424da026 (diff)
downloadxine-lib-eca1bc92a62d5ad690080f4950c9b58c3989f26b.tar.gz
xine-lib-eca1bc92a62d5ad690080f4950c9b58c3989f26b.tar.bz2
cleaning up spu types. now avi subtitles may be enabled again.
(+ missed ffmpeg/dv patch) CVS patchset: 3263 CVS date: 2002/11/15 00:20:31
Diffstat (limited to 'src/libffmpeg/xine_decoder.c')
-rw-r--r--src/libffmpeg/xine_decoder.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c
index 01cec035a..fb1d419cb 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.68 2002/11/14 04:22:55 tmmm Exp $
+ * $Id: xine_decoder.c,v 1.69 2002/11/15 00:20:32 miguelfreitas Exp $
*
* xine decoder plugin using ffmpeg
*
@@ -387,6 +387,11 @@ static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
= strdup ("sorenson svq 1 (ffmpeg)");
break;
+ case BUF_VIDEO_DV:
+ codec = avcodec_find_decoder (CODEC_ID_DVVIDEO);
+ this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
+ = strdup ("DV (ffmpeg)");
+ break;
default:
printf ("ffmpeg: unknown video format (buftype: 0x%08X)\n",
buf->type & 0xFFFF0000);
@@ -980,6 +985,7 @@ static uint32_t supported_video_types[] = {
/* BUF_VIDEO_SORENSON_V1 */
BUF_VIDEO_JPEG,
BUF_VIDEO_MPEG,
+ BUF_VIDEO_DV,
0
};