diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 01:07:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 01:07:46 +0100 |
| commit | 635403e078a017c7c9c633976a986573e09ee939 (patch) | |
| tree | 575bdc05ff42faa59a962393d90be8841d69f36b | |
| parent | cfe33c98b74b97e9b06231ffb981aefdb15be189 (diff) | |
| parent | 9c9b0218e85fcd969308632f75af48a4ce229541 (diff) | |
| download | ffmpeg-635403e078a017c7c9c633976a986573e09ee939.tar.gz | |
Merge commit '9c9b0218e85fcd969308632f75af48a4ce229541'
* commit '9c9b0218e85fcd969308632f75af48a4ce229541':
rtpenc_aac: Merge a definition with a declaration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rtpenc_aac.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/rtpenc_aac.c b/libavformat/rtpenc_aac.c index 5c85ff945a..9bb340e893 100644 --- a/libavformat/rtpenc_aac.c +++ b/libavformat/rtpenc_aac.c @@ -25,16 +25,15 @@ void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size) { 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; + int len, max_packet_size = s->max_payload_size - max_au_headers_size; + uint8_t *p; /* skip ADTS header, if present */ if ((s1->streams[0]->codec->extradata_size) == 0) { size -= 7; buff += 7; } - max_packet_size = s->max_payload_size - max_au_headers_size; /* test if the packet must be sent */ len = (s->buf_ptr - s->buf); |