Merge commit '015c2d923902fcd562571993eaf1231ce388c7f0'
authorClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 13:30:16 +0000 (15:30 +0200)
committerClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 13:30:16 +0000 (15:30 +0200)
* commit '015c2d923902fcd562571993eaf1231ce388c7f0':
  libopencore-amr: Fix ff_dlog()/av_log() invocations

The log changed in our tree in 4a289624545c559107fac93597b23289a8b15c9f
is kept as is since it's the correct thing to do (the log mentions what
the first byte *was*, so it's refering to the source packet, not the
encoded bitstream).

Merged-by: Clément Bœsch <clement@stupeflix.com>
1  2 
libavcodec/libopencore-amr.c

Simple merge