diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 21:59:15 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 22:06:06 +0200 |
commit | 3224a319c0b8b1bfcf842f599630cb9516a503a3 (patch) | |
tree | 2e6f6c475ff2277891d4808c597e6f27e6985e3e /libavformat/mpegtsenc.c | |
parent | 066d77650173185064b730da5e8040d898c2b45d (diff) | |
parent | f8ab9f2fe3730a0e8c3c1eb7c486f7c0041fb3fc (diff) | |
download | ffmpeg-3224a319c0b8b1bfcf842f599630cb9516a503a3.tar.gz |
Merge commit 'f8ab9f2fe3730a0e8c3c1eb7c486f7c0041fb3fc'
* commit 'f8ab9f2fe3730a0e8c3c1eb7c486f7c0041fb3fc':
mpegts: Avoid unnecessary variable shadowing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegtsenc.c')
-rw-r--r-- | libavformat/mpegtsenc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index ec6620f267..8dfd7d756a 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -767,7 +767,6 @@ static int mpegts_write_header(AVFormatContext *s) fail: av_free(pids); for (i = 0; i < s->nb_streams; i++) { - MpegTSWriteStream *ts_st; st = s->streams[i]; ts_st = st->priv_data; if (ts_st) { |