* Upgrade supported FFmpeg API to the 2.5 release branch

funzhang · Dec 20, 2014 · d9f9ca9 · d9f9ca9
1 parent 5112b9a
commit d9f9ca9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,6 @@
 
+ * Upgrade support to OpenCV 2.4.10
+ * Upgrade supported FFmpeg API to the 2.5 release branch
  * Update instructions in the `README.md` file for manual installation in Android Studio
  * Replace deprecated `CvMat` and `IplImage` functionality used in the `Demo` class with new `Indexer` API, and provide sample `pom.xml` file for Maven
  * Make `FFmpegFrameGrabber.getFrameRate()` return `AVStream.avg_frame_rate` instead of `r_frame_rate` ([issue #63](https://github.com/bytedeco/javacv/issues/63))

diff --git a/pom.xml b/pom.xml
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>ffmpeg</artifactId>
-      <version>2.4.2-${javacpp.version}</version>
+      <version>2.5.1-${javacpp.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>