RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

swresample: swr_close() 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-05-15 18:27:23 +02:00
parent 2c7d3ecfc9
commit 96cb4c8718
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@ -15,6 +15,9 @@ libavutil: 2012-10-22
API changes, most recent first: 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 2014-xx-xx - xxxxxxx - lavu 53.14.0 - pixfmt.h
Add AV_PIX_FMT_VDA for new-style VDA acceleration. Add AV_PIX_FMT_VDA for new-style VDA acceleration.

4
libswresample/swresample.c
View File

@ -251,6 +251,10 @@ av_cold void swr_free(SwrContext **ss){
av_freep(ss); av_freep(ss);
} }
av_cold void swr_close(SwrContext *s){
clear_context(s);
}
av_cold int swr_init(struct SwrContext *s){ av_cold int swr_init(struct SwrContext *s){
int ret; int ret;

10
libswresample/swresample.h
View File

@ -202,6 +202,16 @@ struct SwrContext *swr_alloc_set_opts(struct SwrContext *s,
*/ */
void swr_free(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. * Convert audio.
* *

2
libswresample/version.h
View File

@ -29,7 +29,7 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#define LIBSWRESAMPLE_VERSION_MAJOR 0 #define LIBSWRESAMPLE_VERSION_MAJOR 0
#define LIBSWRESAMPLE_VERSION_MINOR 18 #define LIBSWRESAMPLE_VERSION_MINOR 19
#define LIBSWRESAMPLE_VERSION_MICRO 100 #define LIBSWRESAMPLE_VERSION_MICRO 100
#define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \ #define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \