Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

xbmc/utils/BitstreamConverter.{cpp,h}: s/CodecID/AVCodecID/, fixes compile with external ffmpeg >=2.0 #3147

Merged
merged 1 commit into from
Aug 25, 2013
Merged

xbmc/utils/BitstreamConverter.{cpp,h}: s/CodecID/AVCodecID/, fixes compile with external ffmpeg >=2.0 #3147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion xbmc/utils/BitstreamConverter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion xbmc/utils/BitstreamConverter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down