blob: cb849c5dbf84d8c7cc9bd7e0eec050ef10c185dc (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
--- xbmc-12.2.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h 2013-05-03 07:57:41.000000000 +0200
+++ xbmc-12.2/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h 2013-07-31 13:31:34.000000000 +0200
@@ -35,7 +35,7 @@ class CDVDInputStream;
#include "config.h"
#endif
#ifndef _LINUX
-enum CodecID;
+enum AVCodecID;
#include <libavcodec/avcodec.h>
#else
extern "C" {
@@ -88,7 +88,7 @@ public:
{
iId = 0;
iPhysicalId = 0;
- codec = (CodecID)0; // CODEC_ID_NONE
+ codec = (AVCodecID)0; // CODEC_ID_NONE
codec_fourcc = 0;
profile = FF_PROFILE_UNKNOWN;
level = 0;
@@ -118,7 +118,7 @@ public:
int iId; // most of the time starting from 0
int iPhysicalId; // id
- CodecID codec;
+ AVCodecID codec;
unsigned int codec_fourcc; // if available
int profile; // encoder profile of the stream reported by the decoder. used to qualify hw decoders.
int level; // encoder level of the stream reported by the decoder. used to qualify hw decoders.
|
