diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2010-02-11 11:52:59 +0000 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2010-02-11 11:52:59 +0000 |
| commit | afc97d47358f8c4ce0e9989bcd308806d3770409 (patch) | |
| tree | 0edbffa82390bbc11207490153d2427b893f6b7a | |
| parent | e5bea45df76a4888e37bc33f8cc803ec15d3ab7b (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
| -rw-r--r-- | Changelog | 1 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -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 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, \ |