[FFmpeg-cvslog] Merge commit 'a3cc519d1f43bf93cc29fd53284a2b8aa6189a9a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 21 12:32:28 2015 +0100| [34c58618bef02c5584c93e1d39592a309905204b] | committer: Michael Niedermayer

Merge commit 'a3cc519d1f43bf93cc29fd53284a2b8aa6189a9a'

* commit 'a3cc519d1f43bf93cc29fd53284a2b8aa6189a9a':
  rtpdec_h264: Prepare h264_handle_packet_stap_a for sharing with hevc

Conflicts:
	libavformat/rtpdec_h264.c

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

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