History

Merge commit '2e81acc687e64d15dd93c74793060bb5a233f44d'

* commit '2e81acc687e64d15dd93c74793060bb5a233f44d': x86inc: Fix number of operands for cmp* instructions af_channelmap: fix uninitialized variable use introduced in ba8efac977f4276f05274947b2b67d144cbc965a lavfi: add a bump and docs entries for the AVOptions switch Conflicts: Changelog doc/APIchanges libavfilter/version.h

Michael Niedermayer committed 13 years ago

Commit cb20ca12 parents d7e8b3d 2e81acc3 files · +9 −2Browse files

Unified · Split

3 files
  1. Changelog +1 −0
  2. doc/APIchanges +6 −0
  3. libavfilter/version.h +2 −2
Changelog+1−0
@@ -18,6 +18,7 @@ version <next>: · 17 unmodified lines
18- audio phaser filter18- audio phaser filter
19- separatefields filter19- separatefields filter
20- libquvi demuxer20- libquvi demuxer
21- uniform options syntax across all filters
21 22
22 23
23version 1.2:24version 1.2:
doc/APIchanges+6−0
@@ -156,6 +156,12 @@ API changes, most recent first: · 155 unmodified lines
1562012-03-26 - a67d9cf - lavfi 2.66.1001562012-03-26 - a67d9cf - lavfi 2.66.100
157 Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions.157 Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions.
158 158
1592013-xx-xx - lavfi 3.7.0 - avfilter.h
160 Add AVFilter.priv_class for exporting filter options through the AVOptions API
161 in the similar way private options work in lavc and lavf.
162 Add avfilter_get_class().
163 Switch all filters to use AVOptions.
164
1592013-xx-xx - lavu 52.9.0 - pixdesc.h1652013-xx-xx - lavu 52.9.0 - pixdesc.h
160 Add av_pix_fmt_count_planes() function for counting planes in a pixel format.166 Add av_pix_fmt_count_planes() function for counting planes in a pixel format.
161 167
libavfilter/version.h+2−2
@@ -29,8 +29,8 @@ · 28 unmodified lines
29#include "libavutil/avutil.h"29#include "libavutil/avutil.h"
30 30
31#define LIBAVFILTER_VERSION_MAJOR 331#define LIBAVFILTER_VERSION_MAJOR 3
32#define LIBAVFILTER_VERSION_MINOR 5032#define LIBAVFILTER_VERSION_MINOR 51
33#define LIBAVFILTER_VERSION_MICRO 10333#define LIBAVFILTER_VERSION_MICRO 100
34 34
35#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \35#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
36 LIBAVFILTER_VERSION_MINOR, \36 LIBAVFILTER_VERSION_MINOR, \

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t