| @@ -99,3 +99,35 @@
#if LIBAVCODEC_BUILD >= 4690
p_sys->p_context->noise_reduction =
p_sys->i_noise_reduction;
+--- modules/codec/ffmpeg/demux.c.orig 2008-12-29 11:00:02.000000000 +0100
++++ modules/codec/ffmpeg/demux.c 2008-12-29 11:07:31.000000000 +0100
+@@ -162,7 +162,7 @@
+ (int (*) (URLContext *, unsigned char *, int))IORead;
+ p_sys->url.prot->url_write = 0;
+ p_sys->url.prot->url_seek =
+- (offset_t (*) (URLContext *, offset_t, int))IOSeek;
++ (int64_t (*) (URLContext *, int64_t, int))IOSeek;
+ p_sys->url.prot->url_close = 0;
+ p_sys->url.prot->next = 0;
+ init_put_byte( &p_sys->io, p_sys->io_buffer, p_sys->io_buffer_size,
+@@ -215,7 +215,11 @@
+ es_format_Init( &fmt, AUDIO_ES, fcc );
+ fmt.audio.i_channels = cc->channels;
+ fmt.audio.i_rate = cc->sample_rate;
++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ fmt.audio.i_bitspersample = cc->bits_per_sample;
++#else
++ fmt.audio.i_bitspersample = cc->bits_per_coded_sample;
++#endif
+ fmt.audio.i_blockalign = cc->block_align;
+ break;
+ case CODEC_TYPE_VIDEO:
+@@ -464,7 +468,7 @@
+ return i_ret ? i_ret : -1;
+ }
+
+-static offset_t IOSeek( void *opaque, offset_t offset, int whence )
++static int64_t IOSeek( void *opaque, offset_t offset, int whence )
+ {
+ URLContext *p_url = opaque;
+ demux_t *p_demux = p_url->priv_data;
|
