Commit d1105e8f authored by Clément Bœsch's avatar Clément Bœsch

Merge commit '9a38184a'

* commit '9a38184a':
  examples/decode_audio: allocate the packet dynamically
Merged-by: 's avatarClément Bœsch <cboesch@gopro.com>
parents 28fd79c9 9a38184a
...@@ -84,7 +84,7 @@ int main(int argc, char **argv) ...@@ -84,7 +84,7 @@ int main(int argc, char **argv)
uint8_t inbuf[AUDIO_INBUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE]; uint8_t inbuf[AUDIO_INBUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE];
uint8_t *data; uint8_t *data;
size_t data_size; size_t data_size;
AVPacket avpkt; AVPacket *pkt;
AVFrame *decoded_frame = NULL; AVFrame *decoded_frame = NULL;
if (argc <= 2) { if (argc <= 2) {
...@@ -97,7 +97,7 @@ int main(int argc, char **argv) ...@@ -97,7 +97,7 @@ int main(int argc, char **argv)
/* register all the codecs */ /* register all the codecs */
avcodec_register_all(); avcodec_register_all();
av_init_packet(&avpkt); pkt = av_packet_alloc();
/* find the MPEG audio decoder */ /* find the MPEG audio decoder */
codec = avcodec_find_decoder(AV_CODEC_ID_MP2); codec = avcodec_find_decoder(AV_CODEC_ID_MP2);
...@@ -147,7 +147,7 @@ int main(int argc, char **argv) ...@@ -147,7 +147,7 @@ int main(int argc, char **argv)
} }
} }
ret = av_parser_parse2(parser, c, &avpkt.data, &avpkt.size, ret = av_parser_parse2(parser, c, &pkt->data, &pkt->size,
data, data_size, data, data_size,
AV_NOPTS_VALUE, AV_NOPTS_VALUE, 0); AV_NOPTS_VALUE, AV_NOPTS_VALUE, 0);
if (ret < 0) { if (ret < 0) {
...@@ -157,8 +157,8 @@ int main(int argc, char **argv) ...@@ -157,8 +157,8 @@ int main(int argc, char **argv)
data += ret; data += ret;
data_size -= ret; data_size -= ret;
if (avpkt.size) if (pkt->size)
decode(c, &avpkt, decoded_frame, outfile); decode(c, pkt, decoded_frame, outfile);
if (data_size < AUDIO_REFILL_THRESH) { if (data_size < AUDIO_REFILL_THRESH) {
memmove(inbuf, data, data_size); memmove(inbuf, data, data_size);
...@@ -176,6 +176,7 @@ int main(int argc, char **argv) ...@@ -176,6 +176,7 @@ int main(int argc, char **argv)
avcodec_free_context(&c); avcodec_free_context(&c);
av_parser_close(parser); av_parser_close(parser);
av_frame_free(&decoded_frame); av_frame_free(&decoded_frame);
av_packet_free(&pkt);
return 0; return 0;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment