Merge commit 'f8ab9f2fe3730a0e8c3c1eb7c486f7c0041fb3fc'

* commit 'f8ab9f2fe3730a0e8c3c1eb7c486f7c0041fb3fc':
  mpegts: Avoid unnecessary variable shadowing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-07 21:59:15 +02:00
commit 3224a319c0

View File

@ -767,7 +767,6 @@ static int mpegts_write_header(AVFormatContext *s)
fail: fail:
av_free(pids); av_free(pids);
for (i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
MpegTSWriteStream *ts_st;
st = s->streams[i]; st = s->streams[i];
ts_st = st->priv_data; ts_st = st->priv_data;
if (ts_st) { if (ts_st) {