Merge commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 20:01:44 +0000 (21:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 20:01:44 +0000 (21:01 +0100)
commit596f81c75b67eb78fee75de32cd5dd0f4eb85430
treeac325bd88f90339d335fe9983d9df80191e94314
parent34a8de866f88186f54da87a8e322c48910659149
parentfe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc
Merge commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc'

* commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc':
  rtpdec_hevc: Skip 1 byte (DOND) instead of 2 (DONL) between aggregation units

Conflicts:
libavformat/rtpdec_hevc.c

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