[FFmpeg-cvslog] r21755 - in branches/0.5: Changelog libavcodec/avcodec.h

[siretart]

Author: siretart
Date: Thu Feb 11 12:52:59 2010
New Revision: 21755

Log:
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.

Modified:
   branches/0.5/Changelog
   branches/0.5/libavcodec/avcodec.h

Modified: branches/0.5/Changelog
==============================================================================
--- branches/0.5/Changelog	Thu Feb 11 12:45:35 2010	(r21754)
+++ branches/0.5/Changelog	Thu Feb 11 12:52:59 2010	(r21755)
@@ -15,6 +15,7 @@ version 0.5.1:
 - backport av_lockmgr_register(), see doc/APIchanges for details
 
 
+
 version 0.5:
 
 - The "device" muxers and demuxers are now in a new libavdevice library

Modified: branches/0.5/libavcodec/avcodec.h
==============================================================================
--- branches/0.5/libavcodec/avcodec.h	Thu Feb 11 12:45:35 2010	(r21754)
+++ branches/0.5/libavcodec/avcodec.h	Thu Feb 11 12:52:59 2010	(r21755)
@@ -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, \