mpegts: Drop some unnecessary parentheses
mpegts: Avoid unnecessary variable shadowing
mpegts: Fix memory leaks and related crashes in mpegs_write_header()
Merge commit '6d6bd3a3db24747ae5e10716f4782129c38951f6'

* commit '6d6bd3a3db24747ae5e10716f4782129c38951f6':
  mpegts: Drop some unnecessary parentheses

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'f8ab9f2fe3730a0e8c3c1eb7c486f7c0041fb3fc'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '5b220e1e19c17b202d83d9be0868d152109ae8f0'

* commit '5b220e1e19c17b202d83d9be0868d152109ae8f0':
  mpegts: Fix memory leaks and related crashes in mpegs_write_header()

Conflicts:
	libavformat/mpegtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avformat/mpegtsenc: use the correct deallocation functions

Found-by: Carl Eugen Hoyos <ce@hoyos.ws>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
mpegtsenc: Check dynarray_add() for failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/mpegtsenc: Use correct deallocation code on failure of pids array allocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/mpegtsenc: Free services array completely on failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/mpegtsenc: Use av_freep() for pids

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/mov: read reel_name metadata from tmcd atom

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavf/avio: rename url_feof() to avio_feof()

It's a public function and should use the avio_ namespace

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
replace calls to url_feof() with avio_feof()

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>