Merge commit '8633fb47db2ec39eb8bd1bd65302af75a94ff5d0'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 22:03:12 +0000 (23:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 22:03:12 +0000 (23:03 +0100)
commit29f9d82d23ffc4e48c220c68c7041ca581632981
tree4ea28e802df1b855a415754ad05cd6b5ef0c4b04
parentdf38883607d256135082d76f22f4f93051dda690
parent8633fb47db2ec39eb8bd1bd65302af75a94ff5d0
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@gmx.at>
libavformat/rtpdec_formats.h
libavformat/rtpdec_h264.c
libavformat/rtpdec_hevc.c