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)
commit30aa9b727da05d9bf3346ffabdbc983bd5f37616
tree266397b8aa8fb913c80831b39579fe6690b7d0de
parenta435a0337419e7080115a51c283ab0fbbd0ae83f
parent46c0cbd5dc01196949105e49f2ded10aa85a6e39
Merge commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39'

* commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39':
  rtsp: suppress a incompatible pointer types warning

Conflicts:
libavformat/rtsp.c

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