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

Conversation

Projects
None yet
4 participants
@herrnst
Member

herrnst commented Aug 25, 2013

Just found out about a compile error with external ffmpeg (>=2.0) on gentoo:

CPP     xbmc/utils/BitstreamConverter.o
In file included from BitstreamConverter.cpp:25:0:
BitstreamConverter.h:136:31: error: use of enum 'CodecID' without previous declaration
BitstreamConverter.cpp:299:37: error: use of enum 'CodecID' without previous declaration
BitstreamConverter.cpp: In member function 'bool CBitstreamConverter::Open(int, uint8_t*, int, bool)':
BitstreamConverter.cpp:303:13: error: invalid conversion from 'int' to 'AVCodecID' [-fpermissive]
make[1]: *** [BitstreamConverter.o] Error 1
make: *** [xbmc/utils/utils.a] Error 2

This small patch fixes compiling and brings "CodecID" on par with everything else to "AVCodecID". Build-tested with external ffmpeg on gentoo/amd64 and on Ubuntu Precise/amd64 with internal ffmpeg. Probably should be build-tested on iOS/OSX/Android/Win32.

@MartijnKaijser

This comment has been minimized.

Show comment
Hide comment
@MartijnKaijser

MartijnKaijser Aug 25, 2013

Member

jenkins build this please

Member

MartijnKaijser commented Aug 25, 2013

jenkins build this please

davilla added a commit that referenced this pull request Aug 25, 2013

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

@davilla davilla merged commit 81956ed into xbmc:master Aug 25, 2013

1 check passed

default Merged build #155 succeeded in 55 min
Details
@Karlson2k

This comment has been minimized.

Show comment
Hide comment
@Karlson2k

Karlson2k Aug 25, 2013

Member

Funny that it was already fixed by 54f1181, but later (accidentally?) "unfixed" by 6191e52.

Member

Karlson2k commented Aug 25, 2013

Funny that it was already fixed by 54f1181, but later (accidentally?) "unfixed" by 6191e52.

@davilla

This comment has been minimized.

Show comment
Hide comment
@davilla

davilla Aug 25, 2013

Contributor

yea,, dev is 'funny' that way....

Contributor

davilla commented Aug 25, 2013

yea,, dev is 'funny' that way....

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment