Merge commit 'f8ab9f2fe3730a0e8c3c1eb7c486f7c0041fb3fc'

* commit 'f8ab9f2fe3730a0e8c3c1eb7c486f7c0041fb3fc': mpegts: Avoid unnecessary variable shadowing Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 3224a319c0
parent 066d776501 f8ab9f2fe3
commit 3224a319c0
1 changed files with 0 additions and 1 deletions
--- 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) {