[FFmpeg-cvslog] Merge commit '8633fb47db2ec39eb8bd1bd65302af75a94ff5d0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 24 23:03:12 2015 +0100| [29f9d82d23ffc4e48c220c68c7041ca581632981] | committer: Michael Niedermayer

Merge commit '8633fb47db2ec39eb8bd1bd65302af75a94ff5d0'

* commit '8633fb47db2ec39eb8bd1bd65302af75a94ff5d0':
  rtpdec_hevc: Share the implementation of parsing a=framesize with h264

Conflicts:
	libavformat/rtpdec_h264.c

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

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