diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-24 11:11:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-24 11:11:31 +0200 |
| commit | a620c8321efcf51e3d35462a5b7f088815faed14 (patch) | |
| tree | f9d7deeb3874d0d6b00dfe6cab7aa93ef7b92bd8 /libavformat | |
| parent | af5f9c08763baff271401cf7f7478bae4d5db8dc (diff) | |
| parent | c3e58f8fb75d8467161a65b85eb88281547ebab1 (diff) | |
Merge commit 'c3e58f8fb75d8467161a65b85eb88281547ebab1'
* commit 'c3e58f8fb75d8467161a65b85eb88281547ebab1':
matroskaenc: restore compatibility with non referenced AVPacket
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroskaenc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 99d648dcbc..f34813c8b2 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1418,8 +1418,11 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt) // keyframe's timecode is contained in the same cluster for WebM if (codec->codec_type == AVMEDIA_TYPE_AUDIO) { mkv->cur_audio_pkt = *pkt; - mkv->cur_audio_pkt.buf = av_buffer_ref(pkt->buf); - ret = mkv->cur_audio_pkt.buf ? 0 : AVERROR(ENOMEM); + if (pkt->buf) { + mkv->cur_audio_pkt.buf = av_buffer_ref(pkt->buf); + ret = mkv->cur_audio_pkt.buf ? 0 : AVERROR(ENOMEM); + } else + ret = av_dup_packet(&mkv->cur_audio_pkt); } else ret = mkv_write_packet_internal(s, pkt); return ret; |