Merge commit '3fdffc032e8ea5676bc0c2551b900c0dc887835b'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 12:51:33 +0000 (14:51 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 12:51:33 +0000 (14:51 +0200)
* commit '3fdffc032e8ea5676bc0c2551b900c0dc887835b':
  rtsp: Use avcodec_descriptor_get instead of avcodec_find_decoder

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavformat/rtsp.c

Simple merge