From: Clément Bœsch <clement@stupeflix.com>
Date: Tue, 21 Jun 2016 11:43:32 +0000 (+0200)
Subject: Merge commit '943f4bea37dc8d510d2f43c0bbe0df59c9b34768'
X-Git-Tag: n3.1~144
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/f17c65ed83e27e97df503cf0ae1f4c26ae76a7aa

Merge commit '943f4bea37dc8d510d2f43c0bbe0df59c9b34768'

* commit '943f4bea37dc8d510d2f43c0bbe0df59c9b34768':
  rtpdec_h264: Use avpriv_report_missing_feature instead of a manual av_log

This commit is a noop, see d50b3fe463138a8378d0d0884750bd71db825c82

Merged-by: Clément Bœsch <clement@stupeflix.com>
---

f17c65ed83e27e97df503cf0ae1f4c26ae76a7aa