summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2010-02-11 11:52:59 +0000
committerReinhard Tartler <siretart@tauware.de>2010-02-11 11:52:59 +0000
commitafc97d47358f8c4ce0e9989bcd308806d3770409 (patch)
tree0edbffa82390bbc11207490153d2427b893f6b7a /libavcodec
parente5bea45df76a4888e37bc33f8cc803ec15d3ab7b (diff)
reverting objected hunks from previous commit
as discussed with diego on irc, the spurious newline deletion and the LIBAVCODEC_VERSION_MINOR bump are being reverted based on comments on ffmpeg-cvslog by ramiro, uoti and michael. See http://comments.gmane.org/gmane.comp.video.ffmpeg.cvs/28112 for the full context. Originally committed as revision 21755 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/avcodec.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 0794fbef68..835b589ded 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -30,7 +30,7 @@
#include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 21
+#define LIBAVCODEC_VERSION_MINOR 20
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \