diff options
| author | Anton Khirnov <anton@khirnov.net> | 2017-03-16 17:34:12 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2017-04-28 13:47:20 +0200 |
| commit | 831018b0bbe26a603802a9022472f714a59293be (patch) | |
| tree | beddfc357bcd8d1c8236ec60a993a6a5f2931c80 /libavformat | |
| parent | e1c2453a4fac1f7116244d0d05310935c20887e6 (diff) | |
| download | ffmpeg-831018b0bbe26a603802a9022472f714a59293be.tar.gz | |
mpeg4audio: Make avpriv_copy_pce_data() inline
The function currently accepts a PutBitContext and a GetBitContext,
which hardcodes their sizes into the lavc ABI. Since the function is
quite small and only called in a few places, the simplest solution is
making it inline, thus avoiding a runtime dependency completely.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/adtsenc.c | 2 | ||||
| -rw-r--r-- | libavformat/latmenc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c index e7c72d8c02..eac6e7f883 100644 --- a/libavformat/adtsenc.c +++ b/libavformat/adtsenc.c @@ -79,7 +79,7 @@ static int adts_decode_extradata(AVFormatContext *s, ADTSContext *adts, uint8_t 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); } diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c index a98a6ff6b0..ea13a8a38c 100644 --- a/libavformat/latmenc.c +++ b/libavformat/latmenc.c @@ -111,7 +111,7 @@ static int latm_write_frame_header(AVFormatContext *s, PutBitContext *bs) avpriv_copy_bits(bs, par->extradata, ctx->off + 3); if (!ctx->channel_conf) { - avpriv_copy_pce_data(bs, &gb); + ff_copy_pce_data(bs, &gb); } } |