Merge commit 'b5f19f7478492307e4b4763aeac3180faf50e17f'
authorJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 21:56:45 +0000 (18:56 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 21:56:45 +0000 (18:56 -0300)
commitb9d3def9b2cb77eb83542086aa3ac883b4d7efa4
treea35626011027d7ec2a3165dcc09ff912ed9c1821
parentff173ce8f1a8d043ce87c02a017ec55bb51b2297
parentb5f19f7478492307e4b4763aeac3180faf50e17f
Merge commit 'b5f19f7478492307e4b4763aeac3180faf50e17f'

* commit 'b5f19f7478492307e4b4763aeac3180faf50e17f':
  aac: Split function to parse ADTS header data into public and private part

Merged-by: James Almer <jamrial@gmail.com>
14 files changed:
configure
doc/developer.texi
libavcodec/Makefile
libavcodec/aac_adtstoasc_bsf.c
libavcodec/aac_parser.c
libavcodec/aacdec.c
libavcodec/aacdec_fixed.c
libavcodec/aacdec_template.c
libavcodec/adts_header.c
libavcodec/adts_header.h
libavcodec/adts_parser.c
libavcodec/adts_parser.h
libavformat/spdifdec.c
libavformat/spdifenc.c