Merge commit '3567b91e49c6ae101c9a35c90f46b8ad9890ac15'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 22:23:26 +0000 (23:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 22:23:26 +0000 (23:23 +0100)
commit17773f49b7da49ceecc4b6260d5ded6938f9b163
tree931f84efb95880bc513ef45449739178e0587406
parent0f8de2b5f17b051d2cfdf1ba25c2990368df1a27
parent3567b91e49c6ae101c9a35c90f46b8ad9890ac15
Merge commit '3567b91e49c6ae101c9a35c90f46b8ad9890ac15'

* commit '3567b91e49c6ae101c9a35c90f46b8ad9890ac15':
  rtpdec_hevc: Share the implementation of fragmented packets with h264

Conflicts:
libavformat/rtpdec_h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtpdec_formats.h
libavformat/rtpdec_h264.c
libavformat/rtpdec_hevc.c