diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-17 22:25:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-17 22:36:43 +0200 |
| commit | 9a9ceb8776264c799ff9669ed7e287a5daaab564 (patch) | |
| tree | 25748ff74acaa620aa627ed7797a87e986959f19 /libavdevice/avdevice.h | |
| parent | 979bea13003ef489d95d2538ac2fb1c26c6f103b (diff) | |
| parent | d763fb7d47fdbd107ea65cdf511f2f21558f6610 (diff) | |
| download | ffmpeg-9a9ceb8776264c799ff9669ed7e287a5daaab564.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavfi: add select filter
oggdec: fix out of bound write in the ogg demuxer
movenc: create an alternate group for each media type
lavd: add libcdio-paranoia input device for audio CD grabbing
rawdec: refactor private option for raw video demuxers
pcmdec: use unique classes for all pcm demuxers.
rawdec: g722 is always 1 channel/16kHz
Conflicts:
Changelog
configure
doc/filters.texi
libavdevice/avdevice.h
libavfilter/avfilter.h
libavfilter/vf_select.c
tests/ref/lavf/mov
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/avdevice.h')
| -rw-r--r-- | libavdevice/avdevice.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h index 8b75d5cda8..68e3a46a8d 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -23,8 +23,8 @@ #include "libavformat/avformat.h" #define LIBAVDEVICE_VERSION_MAJOR 53 -#define LIBAVDEVICE_VERSION_MINOR 3 -#define LIBAVDEVICE_VERSION_MICRO 3 +#define LIBAVDEVICE_VERSION_MINOR 4 +#define LIBAVDEVICE_VERSION_MICRO 0 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ LIBAVDEVICE_VERSION_MINOR, \ |