[gegl] ff-load: Fix build against ffmpeg 0.8/53+
- From: Jon Nordby <jonnor src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] ff-load: Fix build against ffmpeg 0.8/53+
- Date: Sun, 2 Oct 2011 19:05:47 +0000 (UTC)
commit 1dfb44caf66913d90d70e840695f55018538351c
Author: David Evans <devans macports org>
Date: Sun Oct 2 20:09:27 2011 +0200
ff-load: Fix build against ffmpeg 0.8/53+
Fixes: BGO#652957 - ff-load: Needs to be updated to new ffmpeg/avutils API
operations/external/ff-load.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/operations/external/ff-load.c b/operations/external/ff-load.c
index 37c6aa4..b5c735b 100644
--- a/operations/external/ff-load.c
+++ b/operations/external/ff-load.c
@@ -69,7 +69,11 @@ print_error (const char *filename, int err)
{
switch (err)
{
+#if LIBAVFORMAT_VERSION_MAJOR >= 53
+ case AVERROR(EINVAL):
+#else
case AVERROR_NUMEXPECTED:
+#endif
g_warning ("%s: Incorrect image filename syntax.\n"
"Use '%%d' to specify the image number:\n"
" for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n"
@@ -77,10 +81,14 @@ print_error (const char *filename, int err)
filename);
break;
case AVERROR_INVALIDDATA:
+#if LIBAVFORMAT_VERSION_MAJOR >= 53
+ g_warning ("%s: Error while parsing header or unknown format\n", filename);
+#else
g_warning ("%s: Error while parsing header\n", filename);
break;
case AVERROR_NOFMT:
g_warning ("%s: Unknown format\n", filename);
+#endif
break;
default:
g_warning ("%s: Error while opening file\n", filename);
@@ -278,7 +286,11 @@ prepare (GeglOperation *operation)
for (i = 0; i< p->ic->nb_streams; i++)
{
AVCodecContext *c = p->ic->streams[i]->codec;
+#if LIBAVFORMAT_VERSION_MAJOR >= 53
+ if (c->codec_type == AVMEDIA_TYPE_VIDEO)
+#else
if (c->codec_type == CODEC_TYPE_VIDEO)
+#endif
{
p->video_st = p->ic->streams[i];
p->video_stream = i;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]