Merge commit 'cbdd1806ead8758949f22b4e4f214b035c78e2b9'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 12:19:29 +0000 (13:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 12:22:02 +0000 (13:22 +0100)
commite3cc93aacfcbb2111e3520355d414b55b48f9426
tree311ed7aca4d2d193d703c0396ce480c9bcbdd9c3
parent2b2b6d1e3ceb1bfe77bc8ae9af763ddae9c352a3
parentcbdd1806ead8758949f22b4e4f214b035c78e2b9
Merge commit 'cbdd1806ead8758949f22b4e4f214b035c78e2b9'

* commit 'cbdd1806ead8758949f22b4e4f214b035c78e2b9':
  rtpdec_hevc: Implement parsing of aggregated packets

Conflicts:
libavformat/rtpdec_hevc.c

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