[FFmpeg-cvslog] Merge commit 'c463dfc7e49929a9891884312b23b27d14729c51'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 24 17:25:31 2014 +0200| [e27f781aeb74e6c2b072634658a783ff8b04764b] | committer: Michael Niedermayer

Merge commit 'c463dfc7e49929a9891884312b23b27d14729c51'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e27f781aeb74e6c2b072634658a783ff8b04764b
---