Merge commit 'c463dfc7e49929a9891884312b23b27d14729c51'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Sep 2014 15:25:31 +0000 (17:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Sep 2014 15:25:34 +0000 (17:25 +0200)
commite27f781aeb74e6c2b072634658a783ff8b04764b
tree5fa779b67d849e79d6e9938835581e5d50d83fa2
parent3cd252d29a152743a8ad0493b8bfcb3ccb89062c
parentc463dfc7e49929a9891884312b23b27d14729c51
Merge commit 'c463dfc7e49929a9891884312b23b27d14729c51'

* commit 'c463dfc7e49929a9891884312b23b27d14729c51':
  rtpdec_hevc: Drop a duplicated, nonstandard entry

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtpdec.c
libavformat/rtpdec_formats.h
libavformat/rtpdec_hevc.c