Merge commit '831018b0bbe26a603802a9022472f714a59293be'
authorJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 20:47:21 +0000 (17:47 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 20:47:21 +0000 (17:47 -0300)
commit9ea06d48c2724714b5680122fa720395977a1ac6
treea2ceebd907e3b0450a39a01a4aa0abe310effaae
parent05beee44c6b249f5fe6e06df1bb1a81bfe25a5ac
parent831018b0bbe26a603802a9022472f714a59293be
Merge commit '831018b0bbe26a603802a9022472f714a59293be'

* commit '831018b0bbe26a603802a9022472f714a59293be':
  mpeg4audio: Make avpriv_copy_pce_data() inline

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/aac_adtstoasc_bsf.c
libavcodec/mpeg4audio.c
libavcodec/mpeg4audio.h
libavformat/adtsenc.c
libavformat/latmenc.c