[FFmpeg-cvslog] Merge commit 'cbdd1806ead8758949f22b4e4f214b035c78e2b9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 21 13:19:29 2015 +0100| [e3cc93aacfcbb2111e3520355d414b55b48f9426] | committer: Michael Niedermayer

Merge commit 'cbdd1806ead8758949f22b4e4f214b035c78e2b9'

* commit 'cbdd1806ead8758949f22b4e4f214b035c78e2b9':
  rtpdec_hevc: Implement parsing of aggregated packets

Conflicts:
	libavformat/rtpdec_hevc.c

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

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