Merge commit '16163e6bf2d446c06d4dd053c0852074bb50508d'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 11:44:09 +0000 (12:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 11:44:09 +0000 (12:44 +0100)
commit7fd732b75825ff5e3dd54bf56c1ab9b74477c93f
treebcfbc18c4fcf05230286d5c13688bf232870ae18
parent34c58618bef02c5584c93e1d39592a309905204b
parent16163e6bf2d446c06d4dd053c0852074bb50508d
Merge commit '16163e6bf2d446c06d4dd053c0852074bb50508d'

* commit '16163e6bf2d446c06d4dd053c0852074bb50508d':
  rtpdec_h264: Fix nal type counting after refactoring

Conflicts:
libavformat/rtpdec_h264.c

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