Skip to content

F
ffmpeg.wasm-core
Commit d062db78 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit '21f68c24' 

* commit '21f68c24':
  avcodec: bump version after rotation api

Conflicts:
	libavcodec/version.h
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 4e4dbb99 21f68c24
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
doc/APIchanges
View file @ d062db78
...@@ -26,7 +26,7 @@ API changes, most recent first: ...@@ -26,7 +26,7 @@ API changes, most recent first:
Add AV_FRAME_DATA_DISPLAYMATRIX for exporting frame-level Add AV_FRAME_DATA_DISPLAYMATRIX for exporting frame-level
spatial rendering on video frames for proper display. spatial rendering on video frames for proper display.
2014-05-xx - xxxxxxx - lavc 55.52.0 - avcodec.h 2014-05-xx - xxxxxxx - lavc 55.64.100 / 55.53.0 - avcodec.h
Add AV_PKT_DATA_DISPLAYMATRIX for exporting packet-level Add AV_PKT_DATA_DISPLAYMATRIX for exporting packet-level
spatial rendering on video frames for proper display. spatial rendering on video frames for proper display.
......
libavcodec/version.h
View file @ d062db78
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MINOR 63 #define LIBAVCODEC_VERSION_MINOR 64
#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment