diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 01:41:36 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 01:41:36 +0300 |
| commit | e82b0e612607d652c1519ee31d30272113775679 (patch) | |
| tree | 9e58ce913ebb7fd54257eb67806d5e4351d4a79e /libavcodec/wma.c | |
| parent | ca6fee7606866a0cb7676b95db4c462500cc8d2d (diff) | |
| parent | ee964145b5d229571e00bf6883a44189d02babe2 (diff) | |
Merge commit 'ee964145b5d229571e00bf6883a44189d02babe2'
* commit 'ee964145b5d229571e00bf6883a44189d02babe2':
lavc: remove unused traces of fmtconvert usage
Conflicts:
libavcodec/aac.h
libavcodec/aacdec.c
libavcodec/atrac3.c
libavcodec/vorbisdec.c
libavcodec/wma.c
libavcodec/wma.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wma.c')
| -rw-r--r-- | libavcodec/wma.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/wma.c b/libavcodec/wma.c index 3bc6099389..d8949d5f5f 100644 --- a/libavcodec/wma.c +++ b/libavcodec/wma.c @@ -91,7 +91,6 @@ av_cold int ff_wma_init(AVCodecContext *avctx, int flags2) avctx->bit_rate <= 0) return -1; - ff_fmt_convert_init(&s->fmt_conv, avctx); if (avctx->codec->id == AV_CODEC_ID_WMAV1) s->version = 1; |