Skip to content

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

4 participants

@herrnst
Team Kodi 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
Team Kodi member

jenkins build this please

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

1 check passed

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

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

@davilla
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
Something went wrong with that request. Please try again.