Merge commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Dec 2013 18:36:09 +0000 (19:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Dec 2013 18:37:46 +0000 (19:37 +0100)
* commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39':
  rtsp: suppress a incompatible pointer types warning

Conflicts:
libavformat/rtsp.c

See: 00792322990188b1130ef2befd68ec1d51ab7365
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtsp.c

Simple merge