Bump version and update APIchanges after r25210.

[ffmpeg] / libavcodec / dvbsub.c

diff --git a/libavcodec/dvbsub.c b/libavcodec/dvbsub.c
index ed548e2bd37c0e78e465bbc3df51ae91c631b104..ea55cae31783e76be93955d0fab3adf8260be8e5 100644 (file)
--- a/libavcodec/dvbsub.c
+++ b/libavcodec/dvbsub.c
@@ -1,6 +1,6 @@
 /*
  * DVB subtitle encoding for ffmpeg
- * Copyright (c) 2005 Fabrice Bellard.
+ * Copyright (c) 2005 Fabrice Bellard
  *
  * This file is part of FFmpeg.
  *
@@ -20,7 +20,7 @@
  */
 #include "avcodec.h"
 #include "bytestream.h"
-#include "colorspace.h"
+#include "libavutil/colorspace.h"
 
 typedef struct DVBSubtitleContext {
     int hide_state;
@@ -404,7 +404,7 @@ static int dvbsub_encode(AVCodecContext *avctx,
 
 AVCodec dvbsub_encoder = {
     "dvbsub",
-    CODEC_TYPE_SUBTITLE,
+    AVMEDIA_TYPE_SUBTITLE,
     CODEC_ID_DVB_SUBTITLE,
     sizeof(DVBSubtitleContext),
     NULL,