summaryrefslogtreecommitdiff
path: root/libavresample/options.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2012-11-29 14:53:04 -0500
committerJustin Ruggles <justin.ruggles@gmail.com>2012-12-11 14:00:32 -0500
commit14758e3211d34a97c42b07acae117ce5627d7f57 (patch)
tree9f502994fb29743424c2789727b468ca7055c0dc /libavresample/options.c
parent887d4c05c9126d3598d72a19417296253d59752d (diff)
lavr: temporarily store custom matrix in AVAudioResampleContext
This allows AudioMix to be treated the same way as other conversion contexts and removes the requirement to allocate it at the same time as the AVAudioResampleContext. The current matrix get/set functions are split between the public interface and AudioMix private functions.
Diffstat (limited to 'libavresample/options.c')
-rw-r--r--libavresample/options.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/libavresample/options.c b/libavresample/options.c
index 8f643700cb..824f5e3bc3 100644
--- a/libavresample/options.c
+++ b/libavresample/options.c
@@ -84,13 +84,6 @@ AVAudioResampleContext *avresample_alloc_context(void)
avr->av_class = &av_resample_context_class;
av_opt_set_defaults(avr);
- avr->am = av_mallocz(sizeof(*avr->am));
- if (!avr->am) {
- av_free(avr);
- return NULL;
- }
- avr->am->avr = avr;
-
return avr;
}