summaryrefslogtreecommitdiff
path: root/libavfilter/asrc_flite.c
Commit message (Collapse)AuthorAge
* Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer2012-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9': avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options_table.h libavcodec/snowenc.c libavcodec/tiffenc.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_join.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_delogo.c libavfilter/vf_drawtext.c libavformat/http.c libavformat/img2dec.c libavformat/img2enc.c libavformat/movenc.c libavformat/mpegenc.c libavformat/mpegtsenc.c libavformat/options_table.h libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi: add priv class to filter definitions and flags to filter internal optionsStefano Sabatini2012-08-18
| | | | | This allows the iteration callbacks to discover the internal class and options, and show them when required.
* Remove "Error parsing options string [...]" messages.Clément Bœsch2012-08-09
| | | | | This reduces from 3 to 2 messages for the same syntax error in ffprobe, and from 4 to 3 in filters.
* asrc_flite: do not crash on multiple instances.Nicolas George2012-07-28
| | | | | | | | | | | | | | The voice register functions return the same voice structure upon multiple registration. It causes us two problems: If we delete a voice without deregistering it, it leaves a dangling pointer inside the library. If we delete or unregister a voice at uninit, it may still be in use by another instance of the filter. The second problem is solved by keeping an usage counter inside asrc_flite. This is not thread-safe, but neither is flite itself.
* lavfi: add flite audio sourceStefano Sabatini2012-07-28