[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

Sun Apr 8 21:08:03 CEST 2012

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr  8 20:55:02 2012 +0200| [5d6a40bc747da93bd4ee41a446c35fc60a399671] | committer: Michael Niedermayer

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 at gmx.at>

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