Merge commit 'a335ed767161c6da2815371177cfd5e40f78e5b7'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Feb 2015 20:57:30 +0000 (21:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Feb 2015 20:57:34 +0000 (21:57 +0100)
commitd19ca4b2eae2d4c9170dfa559472e26730fca4a3
treebfd711406b5664044c67c35308f3343d05919bb2
parentac7128a90f53c2ff6f49a2af50bd227df472daca
parenta335ed767161c6da2815371177cfd5e40f78e5b7
Merge commit 'a335ed767161c6da2815371177cfd5e40f78e5b7'

* commit 'a335ed767161c6da2815371177cfd5e40f78e5b7':
  rtpdec_h264: Remove an unnecessary check

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