Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Apr 2012 18:55:02 +0000 (20:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Apr 2012 18:55:11 +0000 (20:55 +0200)
* 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>
1  2 
libavcodec/mpeg12.c
libavcodec/vaapi_mpeg2.c
libavformat/rtpdec.c
libavformat/rtpdec_amr.c
libavformat/rtpdec_asf.c
libavformat/rtpdec_h264.c
libavformat/rtpdec_latm.c
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_xiph.c
libavformat/rtsp.c
libavformat/rtspdec.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge