aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-04-20 04:48:23 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-04-20 04:48:23 +0200
commitefb5fa79f5ca34140db357a00c999286097ab53e (patch)
tree16cc9f34b25abc571f7a9915ff98ff2bb787203c /libavdevice
parentf92b0084c0e02b3c816a9eb234c548487acadae8 (diff)
parent31d76ec2883c04d29d1f173ea99e605a6936613a (diff)
downloadffmpeg-efb5fa79f5ca34140db357a00c999286097ab53e.tar.gz
Merge remote branch 'qatar/master'
* qatar/master: (37 commits) In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function. lavc: remove reference to opt.h from Makefile. prefer avio_check() over url_exist() avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols lavu: remove misc disabled cruft lavu: remove FF_API_OLD_IMAGE_NAMES cruft NOT PULLED lavu: remove FF_API_OLD_EVAL_NAMES cruft lavc: remove misc disabled cruft. lavc: remove the FF_API_INOFFICIAL cruft. lavc: remove the FF_API_SET_STRING_OLD cruft. lavc: remove the FF_API_USE_LPC cruft. lavc: remove the FF_API_SUBTITLE_OLD cruft. lavc: remove the FF_API_VIDEO_OLD cruft. lavc: remove the FF_API_AUDIO_OLD cruft. lavc: remove the FF_API_OPT_SHOW cruft. lavc: remove the FF_API_MM_FLAGS cruft. lavf: remove misc disabled cruft. lavf: remove FF_API_INDEX_BUILT cruft lavf: remove FF_API_URL_CLASS cruft. lavf: remove FF_API_SYMVER cruft ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
-rw-r--r--libavdevice/avdevice.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h
index 0c29c7b975..d31c99e654 100644
--- a/libavdevice/avdevice.h
+++ b/libavdevice/avdevice.h
@@ -21,8 +21,8 @@
#include "libavutil/avutil.h"
-#define LIBAVDEVICE_VERSION_MAJOR 52
-#define LIBAVDEVICE_VERSION_MINOR 4
+#define LIBAVDEVICE_VERSION_MAJOR 53
+#define LIBAVDEVICE_VERSION_MINOR 0
#define LIBAVDEVICE_VERSION_MICRO 0
#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \