Merge commit '95e177eeb21f3e968aa9353bc69d1946966cc835'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 12:56:12 +0000 (14:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 12:56:53 +0000 (14:56 +0200)
commit4bc4f6f17079f6861da9a5df336c18e66cdc3848
tree64e838060cff26173940d5999a0894a4eb602b35
parentdc81c0a0dc7b3f766e5a511a7fab47d61f8a9c03
parent95e177eeb21f3e968aa9353bc69d1946966cc835
Merge commit '95e177eeb21f3e968aa9353bc69d1946966cc835'

* commit '95e177eeb21f3e968aa9353bc69d1946966cc835':
  rtpdec: HEVC/H.265 support

Conflicts:
Changelog
libavformat/rtpdec_hevc.c
libavformat/version.h

See: 96b2ba68c4aef4e92b3e9de87d1fb94f2fb659f0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavformat/rtpdec_hevc.c
libavformat/version.h