diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 18:27:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 18:27:23 +0200 |
| commit | 96cb4c87183798d1badd15a8727efba634023fc1 (patch) | |
| tree | 1b8acf55c2b053551369cac5ab24c7df9499ef0b | |
| parent | 2c7d3ecfc962fe2d2afa84cd347136060468fe0e (diff) | |
| download | ffmpeg-96cb4c87183798d1badd15a8727efba634023fc1.tar.gz | |
swresample: swr_close()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libswresample/swresample.c | 4 | ||||
| -rw-r--r-- | libswresample/swresample.h | 10 | ||||
| -rw-r--r-- | libswresample/version.h | 2 |
4 files changed, 18 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 0426837ab0..a1c501d9d8 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2012-10-22 API changes, most recent first: +2014-05-15 - xxxxxxx - lswr 0.19.100 - swresample.h + Add swr_close() + 2014-xx-xx - xxxxxxx - lavu 53.14.0 - pixfmt.h Add AV_PIX_FMT_VDA for new-style VDA acceleration. diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 54e06e1d00..7076650106 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -251,6 +251,10 @@ av_cold void swr_free(SwrContext **ss){ av_freep(ss); } +av_cold void swr_close(SwrContext *s){ + clear_context(s); +} + av_cold int swr_init(struct SwrContext *s){ int ret; diff --git a/libswresample/swresample.h b/libswresample/swresample.h index 0525289eb0..017a320c01 100644 --- a/libswresample/swresample.h +++ b/libswresample/swresample.h @@ -203,6 +203,16 @@ struct SwrContext *swr_alloc_set_opts(struct SwrContext *s, void swr_free(struct SwrContext **s); /** + * Closes the context so that swr_is_initialized() returns 0. + * + * the context can be brougt back to life by running swr_init(), + * swr_init() can also be used without swr_close(). + * This function is mainly provided for simplifying the usecase + * where one tries to support libavresample and libswresample + */ +void swr_close(struct SwrContext *s); + +/** * Convert audio. * * in and in_count can be set to 0 to flush the last few samples out at the diff --git a/libswresample/version.h b/libswresample/version.h index 3a9287519c..8ca9f59102 100644 --- a/libswresample/version.h +++ b/libswresample/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBSWRESAMPLE_VERSION_MAJOR 0 -#define LIBSWRESAMPLE_VERSION_MINOR 18 +#define LIBSWRESAMPLE_VERSION_MINOR 19 #define LIBSWRESAMPLE_VERSION_MICRO 100 #define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \ |