diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 18:39:42 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 18:39:42 +0400 |
commit | 15ef1cfe6431179fb1cd5707b360a7d6d6bdb9d9 (patch) | |
tree | 9a5c513d65689913fbbe2abb5be0e7ba6d6afa5e /libavutil | |
parent | 6571833d1a54a0be996481970de09487aa5a55d9 (diff) | |
parent | f5962229bfcb14c2879e69ccdf7f1a4934168609 (diff) |
Merge commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609'
* commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609':
avplay: use audio parameters from the decoded frame instead of AVCodecContext
dca: allocate a secondary buffer for extra channels when downmixing
configure: use utilities from /usr/xpg4/bin if it exists
avstring-test: fix memory leaks
Conflicts:
ffplay.c
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/avstring.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavutil/avstring.c b/libavutil/avstring.c index 8b258a4971..73ab7aad1b 100644 --- a/libavutil/avstring.c +++ b/libavutil/avstring.c @@ -252,10 +252,12 @@ int main(void) }; for (i=0; i < FF_ARRAY_ELEMS(strings); i++) { - const char *p= strings[i]; + const char *p = strings[i], *q; printf("|%s|", p); - printf(" -> |%s|", av_get_token(&p, ":")); + q = av_get_token(&p, ":"); + printf(" -> |%s|", q); printf(" + |%s|\n", p); + av_free(q); } } |