[FFmpeg-cvslog] Merge commit 'f8ab9f2fe3730a0e8c3c1eb7c486f7c0041fb3fc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  7 21:59:15 2014 +0200| [3224a319c0b8b1bfcf842f599630cb9516a503a3] | committer: Michael Niedermayer

Merge commit 'f8ab9f2fe3730a0e8c3c1eb7c486f7c0041fb3fc'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3224a319c0b8b1bfcf842f599630cb9516a503a3
---