Commit fc893da8 authored by Gildas Bazin's avatar Gildas Bazin

* modules/codec/theora.c: remove the need for theora_packet_iskeyframe().

parent ed0426dc
...@@ -2425,7 +2425,7 @@ AC_ARG_ENABLE(theora, ...@@ -2425,7 +2425,7 @@ AC_ARG_ENABLE(theora,
if test "${enable_theora}" = "yes" if test "${enable_theora}" = "yes"
then then
AC_CHECK_HEADERS(theora/theora.h, [ AC_CHECK_HEADERS(theora/theora.h, [
AC_CHECK_LIB(theora, theora_packet_iskeyframe, [ AC_CHECK_LIB(theora, theora_granule_time, [
if test "${SYS}" = "mingw32"; then if test "${SYS}" = "mingw32"; then
VLC_ADD_PLUGINS([theora]) VLC_ADD_PLUGINS([theora])
else else
...@@ -2433,7 +2433,7 @@ then ...@@ -2433,7 +2433,7 @@ then
fi fi
theora_libs="-ltheora -logg" theora_libs="-ltheora -logg"
VLC_ADD_LDFLAGS([theora],[${theora_libs}]) ],[ VLC_ADD_LDFLAGS([theora],[${theora_libs}]) ],[
AC_MSG_ERROR([libtheora >= 1.0alpha4 doesn't appear to be installed on your system. AC_MSG_ERROR([libtheora doesn't appear to be installed on your system.
You also need to check that you have a libogg posterior to the 1.0 release.])], You also need to check that you have a libogg posterior to the 1.0 release.])],
[-logg]) [-logg])
]) ])
......
...@@ -442,7 +442,9 @@ static picture_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket ) ...@@ -442,7 +442,9 @@ static picture_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket )
theora_decode_packetin( &p_sys->td, p_oggpacket ); theora_decode_packetin( &p_sys->td, p_oggpacket );
if( theora_packet_iskeyframe( p_oggpacket ) == 1 ) /* Check for keyframe */
if( !(p_oggpacket->packet[0] & 0x80) /* data packet */ &&
!(p_oggpacket->packet[0] & 0x40) /* intra frame */ )
p_sys->b_decoded_first_keyframe = VLC_TRUE; p_sys->b_decoded_first_keyframe = VLC_TRUE;
/* If we haven't seen a single keyframe yet, don't let Theora decode /* If we haven't seen a single keyframe yet, don't let Theora decode
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment