Merge commit 'e208e6d209728d332343aa5390ae377ac0a6305c'

* commit 'e208e6d209728d332343aa5390ae377ac0a6305c': lavu: Add interleaved 4:2:2 8/10-bit formats Conflicts: doc/APIchanges libavutil/pixdesc.c libavutil/pixfmt.h libavutil/version.h

Michael Niedermayer committed 13 years ago

Commit 85f8a3c2 parents 8310bcc e208e6d2 files · +5 −1Browse files

Unified · Split

2 files

doc/APIchanges +4 −0
libavutil/version.h +1 −1

doc/APIchanges+4−0

@@ -15,6 +15,10 @@ libavutil: 2012-10-22 · 14 unmodified lines
15	15
16	16	API changes, most recent first:
17	17
	18	+2013-09-21 - xxxxxxx - lavu 52.16.0 - pixfmt.h
	19	+ Add interleaved 4:2:2 8/10-bit formats AV_PIX_FMT_NV16 and
	20	+ AV_PIX_FMT_NV20.
	21	+
18	22	2013-09-16 - c74c3fb / 3feb3d6 - lavu 52.44.100 / 52.15.0 - mem.h
19	23	Add av_reallocp.
20	24

libavutil/version.h+1−1

@@ -75,7 +75,7 @@ · 74 unmodified lines
75	75	*/
76	76
77	77	#define LIBAVUTIL_VERSION_MAJOR 52
78		−#define LIBAVUTIL_VERSION_MINOR 45
	78	+#define LIBAVUTIL_VERSION_MINOR 46
79	79	#define LIBAVUTIL_VERSION_MICRO 100
80	80
81	81	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

Merge commit 'e208e6d209728d332343aa5390ae377ac0a6305c'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code