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)
* commit 'c463dfc7e49929a9891884312b23b27d14729c51':
  rtpdec_hevc: Drop a duplicated, nonstandard entry

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

Simple merge
Simple merge
Simple merge