Merge commit 'a3cc519d1f43bf93cc29fd53284a2b8aa6189a9a'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 11:32:28 +0000 (12:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 11:32:28 +0000 (12:32 +0100)
commit34c58618bef02c5584c93e1d39592a309905204b
tree3771fea651230fd920a362c0656b950fc093c8a7
parent621450e786c66b84626f0c7bafcfff6bed330e5d
parenta3cc519d1f43bf93cc29fd53284a2b8aa6189a9a
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@gmx.at>
libavformat/rtpdec_h264.c