diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-30 23:47:21 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-30 23:47:21 +0300 |
| commit | 9ea06d48c2724714b5680122fa720395977a1ac6 (patch) | |
| tree | a2ceebd907e3b0450a39a01a4aa0abe310effaae /libavformat/adtsenc.c | |
| parent | 05beee44c6b249f5fe6e06df1bb1a81bfe25a5ac (diff) | |
| parent | 831018b0bbe26a603802a9022472f714a59293be (diff) | |
Merge commit '831018b0bbe26a603802a9022472f714a59293be'
* commit '831018b0bbe26a603802a9022472f714a59293be':
mpeg4audio: Make avpriv_copy_pce_data() inline
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/adtsenc.c')
| -rw-r--r-- | libavformat/adtsenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c index a046c2f2f4..a24f99c447 100644 --- a/libavformat/adtsenc.c +++ b/libavformat/adtsenc.c @@ -85,7 +85,7 @@ static int adts_decode_extradata(AVFormatContext *s, ADTSContext *adts, const ui init_put_bits(&pb, adts->pce_data, MAX_PCE_SIZE); put_bits(&pb, 3, 5); //ID_PCE - adts->pce_size = (avpriv_copy_pce_data(&pb, &gb) + 3) / 8; + adts->pce_size = (ff_copy_pce_data(&pb, &gb) + 3) / 8; flush_put_bits(&pb); } |