aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-01 17:49:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-01 17:49:57 +0200
commitb917d7024e3613155b3c6428ad9049156d55286d (patch)
tree2b128fe5b09fbda7ffb17084c952e71fa81044ce
parentbb5657fabfecd4007816d7310a410f628aa5bf91 (diff)
parentef9732162cd4b593c6db28fdd352ebef21b5c1ca (diff)
downloadffmpeg-b917d7024e3613155b3c6428ad9049156d55286d.tar.gz
Merge commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca'
* commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca': rmdec: do not export anything to AVCodecContext.codec_name Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/rmdec.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index 1775d6cdfb..36764ee9b2 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -254,8 +254,6 @@ static int rm_read_audio_stream_info(AVFormatContext *s, AVIOContext *pb,
return ret;
}
break;
- default:
- av_strlcpy(st->codec->codec_name, buf, sizeof(st->codec->codec_name));
}
switch (ast->deint_id) {
case DEINT_ID_INT4: