From b30368966e86eafa8fef2cf8aa0280a4b739b81d Mon Sep 17 00:00:00 2001
From: Samuel Audet <samuel.audet@gmail.com>
Date: Sat, 9 Aug 2014 20:42:19 +0900
Subject: [PATCH]  * Update presets for FFmpeg where `avcodec` now inherits
 from `swresample` (issue #13)

---
 CHANGELOG.md                                                  | 1 +
 ffmpeg/src/main/java/org/bytedeco/javacpp/avcodec.java        | 1 +
 ffmpeg/src/main/java/org/bytedeco/javacpp/avdevice.java       | 2 +-
 ffmpeg/src/main/java/org/bytedeco/javacpp/avfilter.java       | 2 +-
 ffmpeg/src/main/java/org/bytedeco/javacpp/avformat.java       | 1 +
 .../src/main/java/org/bytedeco/javacpp/presets/avcodec.java   | 4 ++--
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index af57f50fa42..d8c82a96e27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Update presets for FFmpeg where `avcodec` now inherits from `swresample` ([issue #13](https://github.com/bytedeco/javacpp-presets/issues/13))
  * Add a `README.md` file to each presets with links to original project, Java API documentation, and sample usage
  * Add missing overloaded methods with `PointerPointer` parameters in LLVM module
 
diff --git a/ffmpeg/src/main/java/org/bytedeco/javacpp/avcodec.java b/ffmpeg/src/main/java/org/bytedeco/javacpp/avcodec.java
index f882a16bdaa..463e8e3dfaf 100644
--- a/ffmpeg/src/main/java/org/bytedeco/javacpp/avcodec.java
+++ b/ffmpeg/src/main/java/org/bytedeco/javacpp/avcodec.java
@@ -7,6 +7,7 @@
 import org.bytedeco.javacpp.annotation.*;
 
 import static org.bytedeco.javacpp.avutil.*;
+import static org.bytedeco.javacpp.swresample.*;
 
 public class avcodec extends org.bytedeco.javacpp.presets.avcodec {
     static { Loader.load(); }
diff --git a/ffmpeg/src/main/java/org/bytedeco/javacpp/avdevice.java b/ffmpeg/src/main/java/org/bytedeco/javacpp/avdevice.java
index bb97ac8cbe1..3f72e5aa0bb 100644
--- a/ffmpeg/src/main/java/org/bytedeco/javacpp/avdevice.java
+++ b/ffmpeg/src/main/java/org/bytedeco/javacpp/avdevice.java
@@ -7,10 +7,10 @@
 import org.bytedeco.javacpp.annotation.*;
 
 import static org.bytedeco.javacpp.avutil.*;
+import static org.bytedeco.javacpp.swresample.*;
 import static org.bytedeco.javacpp.avcodec.*;
 import static org.bytedeco.javacpp.avformat.*;
 import static org.bytedeco.javacpp.postproc.*;
-import static org.bytedeco.javacpp.swresample.*;
 import static org.bytedeco.javacpp.swscale.*;
 import static org.bytedeco.javacpp.avfilter.*;
 
diff --git a/ffmpeg/src/main/java/org/bytedeco/javacpp/avfilter.java b/ffmpeg/src/main/java/org/bytedeco/javacpp/avfilter.java
index 955eba9e37b..c0fa9292b43 100644
--- a/ffmpeg/src/main/java/org/bytedeco/javacpp/avfilter.java
+++ b/ffmpeg/src/main/java/org/bytedeco/javacpp/avfilter.java
@@ -7,10 +7,10 @@
 import org.bytedeco.javacpp.annotation.*;
 
 import static org.bytedeco.javacpp.avutil.*;
+import static org.bytedeco.javacpp.swresample.*;
 import static org.bytedeco.javacpp.avcodec.*;
 import static org.bytedeco.javacpp.avformat.*;
 import static org.bytedeco.javacpp.postproc.*;
-import static org.bytedeco.javacpp.swresample.*;
 import static org.bytedeco.javacpp.swscale.*;
 
 public class avfilter extends org.bytedeco.javacpp.presets.avfilter {
diff --git a/ffmpeg/src/main/java/org/bytedeco/javacpp/avformat.java b/ffmpeg/src/main/java/org/bytedeco/javacpp/avformat.java
index 8aa690397be..de6feb46088 100644
--- a/ffmpeg/src/main/java/org/bytedeco/javacpp/avformat.java
+++ b/ffmpeg/src/main/java/org/bytedeco/javacpp/avformat.java
@@ -7,6 +7,7 @@
 import org.bytedeco.javacpp.annotation.*;
 
 import static org.bytedeco.javacpp.avutil.*;
+import static org.bytedeco.javacpp.swresample.*;
 import static org.bytedeco.javacpp.avcodec.*;
 
 public class avformat extends org.bytedeco.javacpp.presets.avformat {
diff --git a/ffmpeg/src/main/java/org/bytedeco/javacpp/presets/avcodec.java b/ffmpeg/src/main/java/org/bytedeco/javacpp/presets/avcodec.java
index 884525a150b..2012b0aaaeb 100644
--- a/ffmpeg/src/main/java/org/bytedeco/javacpp/presets/avcodec.java
+++ b/ffmpeg/src/main/java/org/bytedeco/javacpp/presets/avcodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Samuel Audet
+ * Copyright (C) 2013,2014 Samuel Audet
  *
  * This file is part of JavaCPP.
  *
@@ -30,7 +30,7 @@
  *
  * @author Samuel Audet
  */
-@Properties(inherit=avutil.class, target="org.bytedeco.javacpp.avcodec", value={
+@Properties(inherit=swresample.class, target="org.bytedeco.javacpp.avcodec", value={
     @Platform(cinclude={"<libavcodec/avcodec.h>", "<libavcodec/avfft.h>"}, link="avcodec@.55"),
     @Platform(value="windows", link="avcodec-55") })
 public class avcodec implements InfoMapper {