Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #3147 from herrnst/avcodecid2

xbmc/utils/BitstreamConverter.{cpp,h}: s/CodecID/AVCodecID/, fixes compile with external ffmpeg >=2.0
  • Loading branch information...
commit 81956ed39a5a556074d1b9adf3000f5ade1d0c3d 2 parents 3230856 + 9d49db3
@davilla davilla authored
View
2  xbmc/utils/BitstreamConverter.cpp
@@ -296,7 +296,7 @@ CBitstreamConverter::~CBitstreamConverter()
Close();
}
-bool CBitstreamConverter::Open(enum CodecID codec, uint8_t *in_extradata, int in_extrasize, bool to_annexb)
+bool CBitstreamConverter::Open(enum AVCodecID codec, uint8_t *in_extradata, int in_extrasize, bool to_annexb)
{
m_to_annexb = to_annexb;
View
2  xbmc/utils/BitstreamConverter.h
@@ -133,7 +133,7 @@ class CBitstreamConverter
CBitstreamConverter();
~CBitstreamConverter();
- bool Open(enum CodecID codec, uint8_t *in_extradata, int in_extrasize, bool to_annexb);
+ bool Open(enum AVCodecID codec, uint8_t *in_extradata, int in_extrasize, bool to_annexb);
void Close(void);
bool NeedConvert(void) { return m_convert_bitstream; };
bool Convert(uint8_t *pData, int iSize);
Please sign in to comment.
Something went wrong with that request. Please try again.