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)
* commit 'a335ed767161c6da2815371177cfd5e40f78e5b7':
  rtpdec_h264: Remove an unnecessary check

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

Simple merge