summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--src/combined/ffmpeg/ff_video_decoder.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index eee0753b0..ee81985fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
xine-lib (1.1.1?) 20??-??-??
* Bump the FLAC decoder's priority above ffmpegaudio. This should fix
various problems with FLAC playback.
+ * Build fix (undefined symbol) for when using older ffmpeg.
xine-lib (1.1.17) 2009-12-01
* Add support for Matroska SIMPLEBLOCK.
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c
index 093ca4776..727508847 100644
--- a/src/combined/ffmpeg/ff_video_decoder.c
+++ b/src/combined/ffmpeg/ff_video_decoder.c
@@ -1180,6 +1180,7 @@ static void ff_check_pts_tagging(ff_video_decoder_t *this, uint64_t pts)
}
}
}
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
static int ff_vc1_find_header(ff_video_decoder_t *this, buf_element_t *buf)
{
@@ -1224,7 +1225,6 @@ static int ff_check_extradata(ff_video_decoder_t *this, unsigned int codec_type,
return 1;
}
-#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) {
uint8_t *chunk_buf = this->buf;
AVRational avr00 = {0, 1};