mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-21 16:55:05 +02:00
![Michael Niedermayer](/assets/img/avatar_default.png)
* qatar/master: (47 commits) lavc: hide private symbols. lavc: deprecate img_get_alpha_info(). lavc: use avpriv_ prefix for ff_toupper4. lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits. lavc: use avpriv_ prefix for ff_ac3_parse_header. lavc: use avpriv_ prefix for ff_frame_rate_tab. lavc: rename ff_find_start_code to avpriv_mpv_find_start_code lavc: use avpriv_ prefix for ff_split_xiph_headers. lavc: use avpriv_ prefix for ff_dirac_parse_sequence_header. lavc: use avpriv_ prefix for some dv symbols used in lavf. lavc: use avpriv_ prefix for some flac symbols used in lavf. lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf. lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf. lavc: use avpriv_ prefix for ff_aac_parse_header(). lavf: hide private symbols. lavf: use avpriv_ prefix for some dv functions. lavf: use avpriv_ prefix for ff_new_chapter(). avcodec: add CODEC_CAP_DELAY note to avcodec_decode_audio3() documentation avcodec: clarify the CODEC_CAP_DELAY note in avcodec_decode_video2() avcodec: clarify documentation of CODEC_CAP_DELAY ... Conflicts: configure doc/general.texi libavcodec/Makefile libavcodec/aacdec.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/dv.c libavcodec/dvdata.c libavcodec/dvdata.h libavcodec/libspeexenc.c libavcodec/mpegvideo.c libavcodec/version.h libavformat/avidec.c libavformat/dv.c libavformat/dv.h libavformat/flvenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/oggparsespeex.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
64 lines
2.3 KiB
C
64 lines
2.3 KiB
C
/*
|
|
* Copyright (C) 2007 FFmpeg Project
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include "libavutil/intreadwrite.h"
|
|
#include "xiph.h"
|
|
|
|
int avpriv_split_xiph_headers(uint8_t *extradata, int extradata_size,
|
|
int first_header_size, uint8_t *header_start[3],
|
|
int header_len[3])
|
|
{
|
|
int i;
|
|
|
|
if (extradata_size >= 6 && AV_RB16(extradata) == first_header_size) {
|
|
int overall_len = 6;
|
|
for (i=0; i<3; i++) {
|
|
header_len[i] = AV_RB16(extradata);
|
|
extradata += 2;
|
|
header_start[i] = extradata;
|
|
extradata += header_len[i];
|
|
if (overall_len > extradata_size - header_len[i])
|
|
return -1;
|
|
overall_len += header_len[i];
|
|
}
|
|
} else if (extradata_size >= 3 && extradata_size < INT_MAX - 0x1ff && extradata[0] == 2) {
|
|
int overall_len = 3;
|
|
extradata++;
|
|
for (i=0; i<2; i++, extradata++) {
|
|
header_len[i] = 0;
|
|
for (; overall_len < extradata_size && *extradata==0xff; extradata++) {
|
|
header_len[i] += 0xff;
|
|
overall_len += 0xff + 1;
|
|
}
|
|
header_len[i] += *extradata;
|
|
overall_len += *extradata;
|
|
if (overall_len > extradata_size)
|
|
return -1;
|
|
}
|
|
header_len[2] = extradata_size - overall_len;
|
|
header_start[0] = extradata;
|
|
header_start[1] = header_start[0] + header_len[0];
|
|
header_start[2] = header_start[1] + header_len[1];
|
|
} else {
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|