starred/ffmpeg-rockchip-nyanmisaka
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-01-24 02:20:56 +01:00
Code Issues Projects Packages Wiki Activity Actions

Merge commit '50a1c66cf6'

Browse source 
* commit '50a1c66cf6':
  ac3_parser: add a public function for parsing the data required by the demuxer

avpriv_ac3_parse_header() is left in place but without the
GetBitContext parameter, as the mov muxer requires a lot more fields
than just bitstream_id and frame_size from the AC3HeaderInfo struct.

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-10-27 13:52:19 -03:00
commit e0250cf365
9 changed files with 149 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libavcodec/ac3dec.c
View file

@ -36,7 +36,7 @@
#include "bswapdsp.h"
#include "internal.h"
#include "aac_ac3_parser.h"
#include "ac3_parser.h"
#include "ac3_parser_internal.h"
#include "ac3dec.h"
#include "ac3dec_data.h"
#include "kbdwin.h"
@ -297,10 +297,10 @@ static int ac3_parse_header(AC3DecodeContext *s)
*/
static int parse_frame_header(AC3DecodeContext *s)
{
AC3HeaderInfo hdr, *phdr=&hdr;
AC3HeaderInfo hdr;
int err;
err = avpriv_ac3_parse_header(&s->gbc, &phdr);
err = ff_ac3_parse_header(&s->gbc, &hdr);
if (err)
return err;