Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: FFmpeg/FFmpeg
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c402d36afa99
Choose a base ref
...
head repository: FFmpeg/FFmpeg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a70b4935f186
Choose a head ref
  • 4 commits
  • 11 files changed
  • 1 contributor

Commits on Sep 28, 2012

  1. avcodec: Add missing include to version.h

    Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    jamrial authored and michaelni committed Sep 28, 2012
    Copy the full SHA
    35e0903 View commit details
  2. postproc: Create version.h header

    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    jamrial authored and michaelni committed Sep 28, 2012
    Copy the full SHA
    ec87389 View commit details
  3. swresample: Create version.h header

    Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    jamrial authored and michaelni committed Sep 28, 2012
    Copy the full SHA
    b75c3d2 View commit details
  4. Add missing version macros to libraries

    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    jamrial authored and michaelni committed Sep 28, 2012
    Copy the full SHA
    a70b493 View commit details
Showing with 119 additions and 31 deletions.
  1. +2 −2 configure
  2. +10 −0 doc/APIchanges
  3. +2 −0 libavcodec/version.h
  4. +4 −2 libavdevice/version.h
  5. +3 −1 libavfilter/version.h
  6. +2 −1 libpostproc/Makefile
  7. +1 −17 libpostproc/postprocess.h
  8. +47 −0 libpostproc/version.h
  9. +2 −1 libswresample/Makefile
  10. +1 −7 libswresample/swresample.h
  11. +45 −0 libswresample/version.h
4 changes: 2 additions & 2 deletions configure
Original file line number Diff line number Diff line change
@@ -4236,15 +4236,15 @@ fi
eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak
}

get_version_old LIBPOSTPROC libpostproc/postprocess.h
get_version_old LIBSWRESAMPLE libswresample/swresample.h
get_version_old LIBPOSTPROC libpostproc/version.h

get_version libavcodec
get_version libavdevice
get_version libavfilter
get_version libavformat
get_version libavresample
get_version libavutil
get_version libswresample
get_version libswscale

cat > $TMPH <<EOF
10 changes: 10 additions & 0 deletions doc/APIchanges
Original file line number Diff line number Diff line change
@@ -15,6 +15,16 @@ libavutil: 2011-04-18

API changes, most recent first:

2012-09-27 - xxxxxxx - lavd 54.3.100 - version.h
Add LIBAVDEVICE_IDENT symbol.

2012-09-27 - xxxxxxx - lavfi 3.18.100 - version.h
Add LIBAVFILTER_IDENT symbol.

2012-09-27 - xxxxxxx - libswr 0.16.100 - version.h
Add LIBSWRESAMPLE_VERSION, LIBSWRESAMPLE_BUILD
and LIBSWRESAMPLE_IDENT symbols.

2012-09-01 - xxxxxxx - lavu 51.72.100 - parseutils.h
Add av_small_strptime() time parsing function.

2 changes: 2 additions & 0 deletions libavcodec/version.h
Original file line number Diff line number Diff line change
@@ -26,6 +26,8 @@
* Libavcodec version macros.
*/

#include "libavutil/avutil.h"

#define LIBAVCODEC_VERSION_MAJOR 54
#define LIBAVCODEC_VERSION_MINOR 61
#define LIBAVCODEC_VERSION_MICRO 100
6 changes: 4 additions & 2 deletions libavdevice/version.h
Original file line number Diff line number Diff line change
@@ -28,8 +28,8 @@
#include "libavutil/avutil.h"

#define LIBAVDEVICE_VERSION_MAJOR 54
#define LIBAVDEVICE_VERSION_MINOR 2
#define LIBAVDEVICE_VERSION_MICRO 101
#define LIBAVDEVICE_VERSION_MINOR 3
#define LIBAVDEVICE_VERSION_MICRO 100

#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
LIBAVDEVICE_VERSION_MINOR, \
@@ -39,6 +39,8 @@
LIBAVDEVICE_VERSION_MICRO)
#define LIBAVDEVICE_BUILD LIBAVDEVICE_VERSION_INT

#define LIBAVDEVICE_IDENT "Lavd" AV_STRINGIFY(LIBAVDEVICE_VERSION)

/**
* FF_API_* defines may be placed below to indicate public API that will be
* dropped at a future version bump. The defines themselves are not part of
4 changes: 3 additions & 1 deletion libavfilter/version.h
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@
#include "libavutil/avutil.h"

#define LIBAVFILTER_VERSION_MAJOR 3
#define LIBAVFILTER_VERSION_MINOR 17
#define LIBAVFILTER_VERSION_MINOR 18
#define LIBAVFILTER_VERSION_MICRO 100

#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
@@ -40,6 +40,8 @@
LIBAVFILTER_VERSION_MICRO)
#define LIBAVFILTER_BUILD LIBAVFILTER_VERSION_INT

#define LIBAVFILTER_IDENT "Lavfi" AV_STRINGIFY(LIBAVFILTER_VERSION)

/**
* FF_API_* defines may be placed below to indicate public API that will be
* dropped at a future version bump. The defines themselves are not part of
3 changes: 2 additions & 1 deletion libpostproc/Makefile
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@ include $(SUBDIR)../config.mak
NAME = postproc
FFLIBS = avutil

HEADERS = postprocess.h
HEADERS = postprocess.h \
version.h \

OBJS = postprocess.o
18 changes: 1 addition & 17 deletions libpostproc/postprocess.h
Original file line number Diff line number Diff line change
@@ -27,23 +27,7 @@
* external postprocessing API
*/

#include "libavutil/avutil.h"

#ifndef LIBPOSTPROC_VERSION_MAJOR
#define LIBPOSTPROC_VERSION_MAJOR 52
#define LIBPOSTPROC_VERSION_MINOR 0
#define LIBPOSTPROC_VERSION_MICRO 100
#endif

#define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_MAJOR, \
LIBPOSTPROC_VERSION_MINOR, \
LIBPOSTPROC_VERSION_MICRO)
#define LIBPOSTPROC_VERSION AV_VERSION(LIBPOSTPROC_VERSION_MAJOR, \
LIBPOSTPROC_VERSION_MINOR, \
LIBPOSTPROC_VERSION_MICRO)
#define LIBPOSTPROC_BUILD LIBPOSTPROC_VERSION_INT

#define LIBPOSTPROC_IDENT "postproc" AV_STRINGIFY(LIBPOSTPROC_VERSION)
#include "libpostproc/version.h"

/**
* Return the LIBPOSTPROC_VERSION_INT constant.
47 changes: 47 additions & 0 deletions libpostproc/version.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/*
* Version macros.
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

#ifndef POSTPROC_POSTPROCESS_VERSION_H
#define POSTPROC_POSTPROCESS_VERSION_H

/**
* @file
* Libpostproc version macros
*/

#include "libavutil/avutil.h"

#ifndef LIBPOSTPROC_VERSION_MAJOR
#define LIBPOSTPROC_VERSION_MAJOR 52
#define LIBPOSTPROC_VERSION_MINOR 1
#define LIBPOSTPROC_VERSION_MICRO 100
#endif

#define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_MAJOR, \
LIBPOSTPROC_VERSION_MINOR, \
LIBPOSTPROC_VERSION_MICRO)
#define LIBPOSTPROC_VERSION AV_VERSION(LIBPOSTPROC_VERSION_MAJOR, \
LIBPOSTPROC_VERSION_MINOR, \
LIBPOSTPROC_VERSION_MICRO)
#define LIBPOSTPROC_BUILD LIBPOSTPROC_VERSION_INT

#define LIBPOSTPROC_IDENT "postproc" AV_STRINGIFY(LIBPOSTPROC_VERSION)

#endif /* POSTPROC_POSTPROCESS_VERSION_H */
3 changes: 2 additions & 1 deletion libswresample/Makefile
Original file line number Diff line number Diff line change
@@ -3,7 +3,8 @@ include $(SUBDIR)../config.mak
NAME = swresample
FFLIBS = avutil

HEADERS = swresample.h
HEADERS = swresample.h \
version.h \

OBJS = audioconvert.o \
dither.o \
8 changes: 1 addition & 7 deletions libswresample/swresample.h
Original file line number Diff line number Diff line change
@@ -29,13 +29,7 @@
#include <inttypes.h>
#include "libavutil/samplefmt.h"

#define LIBSWRESAMPLE_VERSION_MAJOR 0
#define LIBSWRESAMPLE_VERSION_MINOR 15
#define LIBSWRESAMPLE_VERSION_MICRO 100

#define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \
LIBSWRESAMPLE_VERSION_MINOR, \
LIBSWRESAMPLE_VERSION_MICRO)
#include "libswresample/version.h"

#if LIBSWRESAMPLE_VERSION_MAJOR < 1
#define SWR_CH_MAX 32 ///< Maximum number of channels
45 changes: 45 additions & 0 deletions libswresample/version.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
* Version macros.
*
* This file is part of libswresample
*
* libswresample is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* libswresample is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with libswresample; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

#ifndef SWR_VERSION_H
#define SWR_VERSION_H

/**
* @file
* Libswresample version macros
*/

#include "libavutil/avutil.h"

#define LIBSWRESAMPLE_VERSION_MAJOR 0
#define LIBSWRESAMPLE_VERSION_MINOR 16
#define LIBSWRESAMPLE_VERSION_MICRO 100

#define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \
LIBSWRESAMPLE_VERSION_MINOR, \
LIBSWRESAMPLE_VERSION_MICRO)
#define LIBSWRESAMPLE_VERSION AV_VERSION(LIBSWRESAMPLE_VERSION_MAJOR, \
LIBSWRESAMPLE_VERSION_MINOR, \
LIBSWRESAMPLE_VERSION_MICRO)
#define LIBSWRESAMPLE_BUILD LIBSWRESAMPLE_VERSION_INT

#define LIBSWRESAMPLE_IDENT "SwR" AV_STRINGIFY(LIBSWRESAMPLE_VERSION)

#endif /* SWR_VERSION_H */