Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtsp: Don't use av_malloc(0) if there are no streams
  rtsp: Don't use uninitialized data if there are no streams
  vaapi: mpeg2: fix slice_vertical_position calculation.
  hwaccel: mpeg2: decode first field, if requested.
  cosmetics: Fix indentation
  rtsp: Don't expose the MS-RTSP RTX data stream to the caller

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

diff --cc libavcodec/mpeg12.c
Simple merge

diff --cc libavcodec/vaapi_mpeg2.c
Simple merge

diff --cc libavformat/rtpdec.c
Simple merge

diff --cc libavformat/rtpdec_amr.c
Simple merge

diff --cc libavformat/rtpdec_asf.c
Simple merge

diff --cc libavformat/rtpdec_h264.c
Simple merge

diff --cc libavformat/rtpdec_latm.c
Simple merge

diff --cc libavformat/rtpdec_mpeg4.c
Simple merge

diff --cc libavformat/rtpdec_xiph.c
Simple merge

diff --cc libavformat/rtsp.c
Simple merge

diff --cc libavformat/rtspdec.c
Simple merge