eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-06-16 04:32:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26'

Browse Source 
* commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26':
  pixdesc: Support pixelformat aliases

Conflicts:
	doc/APIchanges
	libavutil/pixdesc.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-04 21:24:24 +02:00
parent 8862c49661 d2962e9f89
commit 073c074447
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/APIchanges
+3
View File
@@ -15,6 +15,9 @@ libavutil: 2012-10-22
API changes, most recent first:
2014-08-xx - xxxxxxx - lavu 53.21.0 - pixdesc.h
Support name aliases for pixel formats.
2014-08-04 - xxxxxxx - lavc 55.72.101 / 55.57.2 - avcodec.h
2014-08-04 - xxxxxxx - lavu 52.95.100 / 53.20.0 - frame.h
Deprecate AVCodecContext.dtg_active_format and use side-data instead.