diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 14:50:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 14:50:31 +0200 |
| commit | d0ac26a264e5b9d5d7d19efddd7205faf1e124d4 (patch) | |
| tree | 707b773735563ba2dbde55b91ce0adc8f21a8903 | |
| parent | a65bc2712db20207dc1065ba3e3e6fa341145d99 (diff) | |
| parent | c692957c4edd119920cd7f2121628dd183589e6a (diff) | |
| download | ffmpeg-d0ac26a264e5b9d5d7d19efddd7205faf1e124d4.tar.gz | |
Merge commit 'c692957c4edd119920cd7f2121628dd183589e6a'
* commit 'c692957c4edd119920cd7f2121628dd183589e6a':
lavu: remove disabled avoptions cruft
lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruft
Conflicts:
libavutil/opt.c
libavutil/opt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index 5542ebd2ca..e0115f79e3 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -103,10 +103,10 @@ #define FF_API_OLD_EVAL_NAMES (LIBAVUTIL_VERSION_MAJOR < 52) #endif #ifndef FF_API_GET_BITS_PER_SAMPLE_FMT -#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 52) +#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 53) #endif #ifndef FF_API_FIND_OPT -#define FF_API_FIND_OPT (LIBAVUTIL_VERSION_MAJOR < 52) +#define FF_API_FIND_OPT (LIBAVUTIL_VERSION_MAJOR < 53) #endif #ifndef FF_API_AV_FIFO_PEEK #define FF_API_AV_FIFO_PEEK (LIBAVUTIL_VERSION_MAJOR < 52) |