mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '9c9b0218e85fcd969308632f75af48a4ce229541'
* commit '9c9b0218e85fcd969308632f75af48a4ce229541': rtpenc_aac: Merge a definition with a declaration Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
635403e078
|
@ -25,16 +25,15 @@
|
||||||
void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size)
|
void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size)
|
||||||
{
|
{
|
||||||
RTPMuxContext *s = s1->priv_data;
|
RTPMuxContext *s = s1->priv_data;
|
||||||
int len, max_packet_size;
|
|
||||||
uint8_t *p;
|
|
||||||
const int max_au_headers_size = 2 + 2 * s->max_frames_per_packet;
|
const int max_au_headers_size = 2 + 2 * s->max_frames_per_packet;
|
||||||
|
int len, max_packet_size = s->max_payload_size - max_au_headers_size;
|
||||||
|
uint8_t *p;
|
||||||
|
|
||||||
/* skip ADTS header, if present */
|
/* skip ADTS header, if present */
|
||||||
if ((s1->streams[0]->codec->extradata_size) == 0) {
|
if ((s1->streams[0]->codec->extradata_size) == 0) {
|
||||||
size -= 7;
|
size -= 7;
|
||||||
buff += 7;
|
buff += 7;
|
||||||
}
|
}
|
||||||
max_packet_size = s->max_payload_size - max_au_headers_size;
|
|
||||||
|
|
||||||
/* test if the packet must be sent */
|
/* test if the packet must be sent */
|
||||||
len = (s->buf_ptr - s->buf);
|
len = (s->buf_ptr - s->buf);
|
||||||
|
|
Loading…
Reference in New Issue