From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 20 Feb 2015 20:57:30 +0000 (+0100)
Subject: Merge commit 'a335ed767161c6da2815371177cfd5e40f78e5b7'
X-Git-Tag: android-x86-6.0-r1~191
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d19ca4b2eae2d4c9170dfa559472e26730fca4a3;p=android-x86%2Fexternal-ffmpeg.git

Merge commit 'a335ed767161c6da2815371177cfd5e40f78e5b7'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

d19ca4b2eae2d4c9170dfa559472e26730fca4a3