diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2002-09-04 23:31:05 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2002-09-04 23:31:05 +0000 |
| commit | 403f01979cef7e03b8322ddb870e3959c8de0f77 (patch) | |
| tree | 0c40e03354069d59379b924ac9deeee0d17b10d8 /src/libspucc/cc_decoder.c | |
| parent | d1010f51a2cb07ba83d71423ab740a5a0c3d0934 (diff) | |
| download | xine-lib-403f01979cef7e03b8322ddb870e3959c8de0f77.tar.gz xine-lib-403f01979cef7e03b8322ddb870e3959c8de0f77.tar.bz2 | |
merging in the new_api branch ... unfortunately video_out / vo_scale is broken now ... matthias/miguel: please fix it :-)
CVS patchset: 2606
CVS date: 2002/09/04 23:31:05
Diffstat (limited to 'src/libspucc/cc_decoder.c')
| -rw-r--r-- | src/libspucc/cc_decoder.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libspucc/cc_decoder.c b/src/libspucc/cc_decoder.c index a01241e13..2820671ae 100644 --- a/src/libspucc/cc_decoder.c +++ b/src/libspucc/cc_decoder.c @@ -20,7 +20,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: cc_decoder.c,v 1.16 2002/04/26 20:31:47 jkeil Exp $ + * $Id: cc_decoder.c,v 1.17 2002/09/04 23:31:09 guenter Exp $ * * stuff needed to provide closed captioning decoding and display * @@ -37,8 +37,8 @@ #include <inttypes.h> -#include "video_out.h" #include "xine_internal.h" +#include "video_out.h" #include "xineutils.h" #include "osd.h" #include "video_out/alphablend.h" |