Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
db1d889c
Commit
db1d889c
authored
Mar 14, 2008
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport recent ffmpeg changes in headerfile locations.
parent
45a68418
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
62 additions
and
40 deletions
+62
-40
configure.ac
configure.ac
+7
-7
modules/codec/ffmpeg/audio.c
modules/codec/ffmpeg/audio.c
+4
-2
modules/codec/ffmpeg/chroma.c
modules/codec/ffmpeg/chroma.c
+4
-2
modules/codec/ffmpeg/deinterlace.c
modules/codec/ffmpeg/deinterlace.c
+4
-2
modules/codec/ffmpeg/demux.c
modules/codec/ffmpeg/demux.c
+6
-4
modules/codec/ffmpeg/encoder.c
modules/codec/ffmpeg/encoder.c
+4
-2
modules/codec/ffmpeg/ffmpeg.c
modules/codec/ffmpeg/ffmpeg.c
+4
-2
modules/codec/ffmpeg/ffmpeg.h
modules/codec/ffmpeg/ffmpeg.h
+1
-1
modules/codec/ffmpeg/mux.c
modules/codec/ffmpeg/mux.c
+5
-3
modules/codec/ffmpeg/postprocess.c
modules/codec/ffmpeg/postprocess.c
+4
-2
modules/codec/ffmpeg/scale.c
modules/codec/ffmpeg/scale.c
+4
-2
modules/codec/ffmpeg/video.c
modules/codec/ffmpeg/video.c
+4
-2
modules/codec/ffmpeg/video_filter.c
modules/codec/ffmpeg/video_filter.c
+4
-2
modules/codec/zvbi.c
modules/codec/zvbi.c
+7
-7
No files found.
configure.ac
View file @
db1d889c
...
@@ -2716,10 +2716,10 @@ dnl Look for a ffmpeg-config (we are on debian )
...
@@ -2716,10 +2716,10 @@ dnl Look for a ffmpeg-config (we are on debian )
dnl Trying with pkg-config
dnl Trying with pkg-config
PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat],
PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat],
[
[
AC_CHECK_HEADERS(ffmpeg/avcodec.h
, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])]
)
AC_CHECK_HEADERS(ffmpeg/avcodec.h
libavcodec/avcodec.h
)
AC_CHECK_HEADERS(ffmpeg/avformat.h)
AC_CHECK_HEADERS(ffmpeg/avformat.h
libavformat/avformat.h
)
AC_CHECK_HEADERS(ffmpeg/avutil.h)
AC_CHECK_HEADERS(ffmpeg/avutil.h
libavutil/avutil.h
)
AC_CHECK_HEADERS(postproc/postprocess.h
, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])]
)
AC_CHECK_HEADERS(postproc/postprocess.h
libpostproc/postprocess.h
)
if test "${SYS}" = "darwin"; then
if test "${SYS}" = "darwin"; then
VLC_ADD_BUILTINS([ffmpeg])
VLC_ADD_BUILTINS([ffmpeg])
else
else
...
@@ -2753,9 +2753,9 @@ dnl Trying with pkg-config
...
@@ -2753,9 +2753,9 @@ dnl Trying with pkg-config
dnl
dnl
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_ffmpeg}"
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_ffmpeg}"
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}"
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}"
AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] )
AC_CHECK_HEADERS(ffmpeg/avcodec.h
libavcodec/avcodec.h
, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] )
AC_CHECK_HEADERS(ffmpeg/avformat.h)
AC_CHECK_HEADERS(ffmpeg/avformat.h
libavformat/avformat.h
)
AC_CHECK_HEADERS(ffmpeg/avutil.h)
AC_CHECK_HEADERS(ffmpeg/avutil.h
libavutil/avutil.h
)
AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] )
AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] )
AC_CHECK_LIB(avutil, av_crc_init, [
AC_CHECK_LIB(avutil, av_crc_init, [
...
...
modules/codec/ffmpeg/audio.c
View file @
db1d889c
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* audio.c: audio decoder using ffmpeg library
* audio.c: audio decoder using ffmpeg library
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999-2003 the VideoLAN team
* Copyright (C) 1999-2003 the VideoLAN team
* $Id$
* $Id
: e9bbbf4f02c1ed03a675a01a454e20da950a1d2c
$
*
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org>
* Gildas Bazin <gbazin@videolan.org>
...
@@ -29,7 +29,9 @@
...
@@ -29,7 +29,9 @@
#include <vlc/decoder.h>
#include <vlc/decoder.h>
/* ffmpeg header */
/* ffmpeg header */
#ifdef HAVE_FFMPEG_AVCODEC_H
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h>
# include <ffmpeg/avcodec.h>
#else
#else
# include <avcodec.h>
# include <avcodec.h>
...
...
modules/codec/ffmpeg/chroma.c
View file @
db1d889c
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* chroma.c: chroma conversion using ffmpeg library
* chroma.c: chroma conversion using ffmpeg library
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999-2001 the VideoLAN team
* Copyright (C) 1999-2001 the VideoLAN team
* $Id:
67176722e9e6427a26e688099e86eed10982bffa
$
* $Id:
25bcdd7769341c4b0cde9936d9e2d6ff9b2f990e
$
*
*
* Authors: Gildas Bazin <gbazin@videolan.org>
* Authors: Gildas Bazin <gbazin@videolan.org>
*
*
...
@@ -32,7 +32,9 @@
...
@@ -32,7 +32,9 @@
#endif
#endif
/* ffmpeg header */
/* ffmpeg header */
#ifdef HAVE_FFMPEG_AVCODEC_H
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h>
# include <ffmpeg/avcodec.h>
#else
#else
# include <avcodec.h>
# include <avcodec.h>
...
...
modules/codec/ffmpeg/deinterlace.c
View file @
db1d889c
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
* using the ffmpeg library
* using the ffmpeg library
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999-2001 the VideoLAN team
* Copyright (C) 1999-2001 the VideoLAN team
* $Id$
* $Id
: dfbd59c35f3f29aa44a18508cc96e9dfd5506386
$
*
*
* Authors: Gildas Bazin <gbazin@videolan.org>
* Authors: Gildas Bazin <gbazin@videolan.org>
*
*
...
@@ -31,7 +31,9 @@
...
@@ -31,7 +31,9 @@
#include <vlc_filter.h>
#include <vlc_filter.h>
/* ffmpeg header */
/* ffmpeg header */
#ifdef HAVE_FFMPEG_AVCODEC_H
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h>
# include <ffmpeg/avcodec.h>
#else
#else
# include <avcodec.h>
# include <avcodec.h>
...
...
modules/codec/ffmpeg/demux.c
View file @
db1d889c
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* demux.c: demuxer using ffmpeg (libavformat).
* demux.c: demuxer using ffmpeg (libavformat).
*****************************************************************************
*****************************************************************************
* Copyright (C) 2004 the VideoLAN team
* Copyright (C) 2004 the VideoLAN team
* $Id:
95d2460bf93b85608fa27565f1475aadd8a5736
0 $
* $Id:
e428b16733ad83a278cf7c3142d5b50ad394ba9
0 $
*
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org>
* Gildas Bazin <gbazin@videolan.org>
...
@@ -32,10 +32,12 @@
...
@@ -32,10 +32,12 @@
#include "vlc_meta.h"
#include "vlc_meta.h"
/* ffmpeg header */
/* ffmpeg header */
#ifdef HAVE_FFMPEG_AVFORMAT_H
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <ffmpeg/avformat.h>
# include <libavcodec/avcodec.h>
#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h>
#else
#else
# include <av
format
.h>
# include <av
codec
.h>
#endif
#endif
#include "ffmpeg.h"
#include "ffmpeg.h"
...
...
modules/codec/ffmpeg/encoder.c
View file @
db1d889c
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* encoder.c: video and audio encoder using the ffmpeg library
* encoder.c: video and audio encoder using the ffmpeg library
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999-2004 the VideoLAN team
* Copyright (C) 1999-2004 the VideoLAN team
* $Id:
6c047e3306d4689e4df2d70843fdd85978b3e0b7
$
* $Id:
54b4c137d13d169b336327d57c6c518a0c6ce752
$
*
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org>
* Gildas Bazin <gbazin@videolan.org>
...
@@ -36,7 +36,9 @@
...
@@ -36,7 +36,9 @@
/* ffmpeg header */
/* ffmpeg header */
#define HAVE_MMX 1
#define HAVE_MMX 1
#ifdef HAVE_FFMPEG_AVCODEC_H
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h>
# include <ffmpeg/avcodec.h>
#else
#else
# include <avcodec.h>
# include <avcodec.h>
...
...
modules/codec/ffmpeg/ffmpeg.c
View file @
db1d889c
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* ffmpeg.c: video decoder using ffmpeg library
* ffmpeg.c: video decoder using ffmpeg library
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999-2001 the VideoLAN team
* Copyright (C) 1999-2001 the VideoLAN team
* $Id:
7bacb2eec7f29bf73a418bf3391171df854b78cb
$
* $Id:
07308ad08e7bb6c9457522e89e9183cfba8daa6a
$
*
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org>
* Gildas Bazin <gbazin@videolan.org>
...
@@ -30,7 +30,9 @@
...
@@ -30,7 +30,9 @@
/* ffmpeg header */
/* ffmpeg header */
#define HAVE_MMX 1
#define HAVE_MMX 1
#ifdef HAVE_FFMPEG_AVCODEC_H
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h>
# include <ffmpeg/avcodec.h>
#else
#else
# include <avcodec.h>
# include <avcodec.h>
...
...
modules/codec/ffmpeg/ffmpeg.h
View file @
db1d889c
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* ffmpeg.h: decoder using the ffmpeg library
* ffmpeg.h: decoder using the ffmpeg library
*****************************************************************************
*****************************************************************************
* Copyright (C) 2001 the VideoLAN team
* Copyright (C) 2001 the VideoLAN team
* $Id:
f2ea5ef3a73821145591172cfb79c3d8813f66a
d $
* $Id:
141346cbea0c8369956c9778ad1fc5a2604baf1
d $
*
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*
...
...
modules/codec/ffmpeg/mux.c
View file @
db1d889c
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* mux.c: muxer using ffmpeg (libavformat).
* mux.c: muxer using ffmpeg (libavformat).
*****************************************************************************
*****************************************************************************
* Copyright (C) 2006 the VideoLAN team
* Copyright (C) 2006 the VideoLAN team
* $Id$
* $Id
: b16eda2ca11b0f133230261a7e3b25da504c7a4f
$
*
*
* Authors: Gildas Bazin <gbazin@videolan.org>
* Authors: Gildas Bazin <gbazin@videolan.org>
*
*
...
@@ -31,9 +31,11 @@
...
@@ -31,9 +31,11 @@
#include <vlc/sout.h>
#include <vlc/sout.h>
/* ffmpeg header */
/* ffmpeg header */
#ifdef HAVE_FFMPEG_AVFORMAT_H
#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
# include <libavformat/avformat.h>
#elif defined(HAVE_FFMPEG_AVFORMAT_H)
# include <ffmpeg/avformat.h>
# include <ffmpeg/avformat.h>
#el
se
#el
if defined(HAVE_LIBAVFORMAT_TREE)
# include <avformat.h>
# include <avformat.h>
#endif
#endif
...
...
modules/codec/ffmpeg/postprocess.c
View file @
db1d889c
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* postprocess.c: video postprocessing using the ffmpeg library
* postprocess.c: video postprocessing using the ffmpeg library
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999-2001 the VideoLAN team
* Copyright (C) 1999-2001 the VideoLAN team
* $Id:
2c9471842b31cdcdd4bfad33cff706829f7d72e9
$
* $Id:
b712d81d6e2469b1dab017913ae6d8fc7951fa16
$
*
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
* Gildas Bazin <gbazin@netcourrier.com>
...
@@ -27,7 +27,9 @@
...
@@ -27,7 +27,9 @@
#include <vlc/decoder.h>
#include <vlc/decoder.h>
/* ffmpeg header */
/* ffmpeg header */
#ifdef HAVE_FFMPEG_AVCODEC_H
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h>
# include <ffmpeg/avcodec.h>
#else
#else
# include <avcodec.h>
# include <avcodec.h>
...
...
modules/codec/ffmpeg/scale.c
View file @
db1d889c
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* filter.c: video scaling module using the swscale library
* filter.c: video scaling module using the swscale library
*****************************************************************************
*****************************************************************************
* Copyright (C) 2003 the VideoLAN team
* Copyright (C) 2003 the VideoLAN team
* $Id$
* $Id
: 15f0446558be64aa05fbdd5a0bebea4e9deffede
$
*
*
* Author: Gildas Bazin <gbazin@videolan.org>
* Author: Gildas Bazin <gbazin@videolan.org>
*
*
...
@@ -31,7 +31,9 @@
...
@@ -31,7 +31,9 @@
#include <vlc_cpu.h>
#include <vlc_cpu.h>
/* ffmpeg headers */
/* ffmpeg headers */
#ifdef HAVE_FFMPEG_AVCODEC_H
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h>
# include <ffmpeg/avcodec.h>
#else
#else
# include <avcodec.h>
# include <avcodec.h>
...
...
modules/codec/ffmpeg/video.c
View file @
db1d889c
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* video.c: video decoder using the ffmpeg library
* video.c: video decoder using the ffmpeg library
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999-2001 the VideoLAN team
* Copyright (C) 1999-2001 the VideoLAN team
* $Id:
5376a0d2d02a3ecdf7cb2c4c200d5749e803182b
$
* $Id:
ca6478ad225370a44eb5a83415f88ddf02e1da0d
$
*
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org>
* Gildas Bazin <gbazin@videolan.org>
...
@@ -30,7 +30,9 @@
...
@@ -30,7 +30,9 @@
#include <vlc/input.h>
/* hmmm, just for INPUT_RATE_DEFAULT */
#include <vlc/input.h>
/* hmmm, just for INPUT_RATE_DEFAULT */
/* ffmpeg header */
/* ffmpeg header */
#ifdef HAVE_FFMPEG_AVCODEC_H
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h>
# include <ffmpeg/avcodec.h>
#else
#else
# include <avcodec.h>
# include <avcodec.h>
...
...
modules/codec/ffmpeg/video_filter.c
View file @
db1d889c
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
* using the ffmpeg library
* using the ffmpeg library
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999-2001 the VideoLAN team
* Copyright (C) 1999-2001 the VideoLAN team
* $Id:
a6d66457c73a31abbe49d51c6f0ef10b6a57234b
$
* $Id:
c09a80e4b2b2876e8b05e32bde1f28ccd5c7e530
$
*
*
* Authors: Gildas Bazin <gbazin@videolan.org>
* Authors: Gildas Bazin <gbazin@videolan.org>
*
*
...
@@ -30,7 +30,9 @@
...
@@ -30,7 +30,9 @@
#include "vlc_filter.h"
#include "vlc_filter.h"
/* ffmpeg header */
/* ffmpeg header */
#ifdef HAVE_FFMPEG_AVCODEC_H
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h>
# include <ffmpeg/avcodec.h>
#else
#else
# include <avcodec.h>
# include <avcodec.h>
...
...
modules/codec/zvbi.c
View file @
db1d889c
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* zvbi.c : VBI and Teletext PES demux and decoder using libzvbi
* zvbi.c : VBI and Teletext PES demux and decoder using libzvbi
*****************************************************************************
*****************************************************************************
* Copyright (C) 2007, M2X
* Copyright (C) 2007, M2X
* $Id: $
* $Id:
a7257a7fa24f88a61c823bcf4e2506ca11d255b6
$
*
*
* Authors: Derk-Jan Hartman <djhartman at m2x dot nl>
* Authors: Derk-Jan Hartman <djhartman at m2x dot nl>
* Jean-Paul Saman <jpsaman at m2x dot nl>
* Jean-Paul Saman <jpsaman at m2x dot nl>
...
@@ -133,7 +133,7 @@ struct decoder_sys_t
...
@@ -133,7 +133,7 @@ struct decoder_sys_t
int
i_align
;
int
i_align
;
/* Misc */
/* Misc */
#if
def HAVE_FFMPEG_SWSCALE_H
#if
defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)
image_handler_t
*
p_image
;
image_handler_t
*
p_image
;
#endif
#endif
};
};
...
@@ -178,7 +178,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -178,7 +178,7 @@ static int Open( vlc_object_t *p_this )
}
}
memset
(
p_sys
,
0
,
sizeof
(
decoder_sys_t
)
);
memset
(
p_sys
,
0
,
sizeof
(
decoder_sys_t
)
);
#if
def HAVE_FFMPEG_SWSCALE_H
#if
defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)
p_sys
->
p_image
=
image_HandlerCreate
(
VLC_OBJECT
(
p_dec
)
);
p_sys
->
p_image
=
image_HandlerCreate
(
VLC_OBJECT
(
p_dec
)
);
if
(
!
p_sys
->
p_image
)
if
(
!
p_sys
->
p_image
)
{
{
...
@@ -222,7 +222,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -222,7 +222,7 @@ static int Open( vlc_object_t *p_this )
if
(
p_sys
->
b_text
)
if
(
p_sys
->
b_text
)
p_dec
->
fmt_out
.
video
.
i_chroma
=
VLC_FOURCC
(
'T'
,
'E'
,
'X'
,
'T'
);
p_dec
->
fmt_out
.
video
.
i_chroma
=
VLC_FOURCC
(
'T'
,
'E'
,
'X'
,
'T'
);
else
else
#if
def HAVE_FFMPEG_SWSCALE_H
#if
defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)
p_dec
->
fmt_out
.
video
.
i_chroma
=
VLC_FOURCC
(
'Y'
,
'U'
,
'V'
,
'A'
);
p_dec
->
fmt_out
.
video
.
i_chroma
=
VLC_FOURCC
(
'Y'
,
'U'
,
'V'
,
'A'
);
#else
#else
p_dec
->
fmt_out
.
video
.
i_chroma
=
VLC_FOURCC
(
'R'
,
'G'
,
'B'
,
'A'
);
p_dec
->
fmt_out
.
video
.
i_chroma
=
VLC_FOURCC
(
'R'
,
'G'
,
'B'
,
'A'
);
...
@@ -238,7 +238,7 @@ static void Close( vlc_object_t *p_this )
...
@@ -238,7 +238,7 @@ static void Close( vlc_object_t *p_this )
decoder_t
*
p_dec
=
(
decoder_t
*
)
p_this
;
decoder_t
*
p_dec
=
(
decoder_t
*
)
p_this
;
decoder_sys_t
*
p_sys
=
p_dec
->
p_sys
;
decoder_sys_t
*
p_sys
=
p_dec
->
p_sys
;
#if
def HAVE_FFMPEG_SWSCALE_H
#if
defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)
if
(
p_sys
->
p_image
)
image_HandlerDelete
(
p_sys
->
p_image
);
if
(
p_sys
->
p_image
)
image_HandlerDelete
(
p_sys
->
p_image
);
#endif
#endif
if
(
p_sys
->
p_vbi_dec
)
vbi_decoder_delete
(
p_sys
->
p_vbi_dec
);
if
(
p_sys
->
p_vbi_dec
)
vbi_decoder_delete
(
p_sys
->
p_vbi_dec
);
...
@@ -315,7 +315,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
...
@@ -315,7 +315,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
/* Create a new subpicture region */
/* Create a new subpicture region */
memset
(
&
fmt
,
0
,
sizeof
(
video_format_t
)
);
memset
(
&
fmt
,
0
,
sizeof
(
video_format_t
)
);
fmt
.
i_chroma
=
p_sys
->
b_text
?
VLC_FOURCC
(
'T'
,
'E'
,
'X'
,
'T'
)
:
fmt
.
i_chroma
=
p_sys
->
b_text
?
VLC_FOURCC
(
'T'
,
'E'
,
'X'
,
'T'
)
:
#if
def HAVE_FFMPEG_SWSCALE_H
#if
defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)
VLC_FOURCC
(
'Y'
,
'U'
,
'V'
,
'A'
);
VLC_FOURCC
(
'Y'
,
'U'
,
'V'
,
'A'
);
#else
#else
VLC_FOURCC
(
'R'
,
'G'
,
'B'
,
'A'
);
VLC_FOURCC
(
'R'
,
'G'
,
'B'
,
'A'
);
...
@@ -375,7 +375,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
...
@@ -375,7 +375,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
}
}
else
else
{
{
#if
def HAVE_FFMPEG_SWSCALE_H
#if
defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)
video_format_t
fmt_in
;
video_format_t
fmt_in
;
picture_t
*
p_pic
,
*
p_dest
;
picture_t
*
p_pic
,
*
p_dest
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment