RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-12 10:15:22 +00:00
Code Issues Projects Releases Wiki Activity

lavf/mux: do not pass a copy of the packet to write_packet().

Browse Source 
Sometimes the muxer modifies the packet, like for instance lavf/mp3enc
changing pkt->destruct in order to keep a copy. These changes must be
kept, even though the muxer behaviour is questionable. Regression since
0072116.

Fixes #2124.
This commit is contained in:
Clément Bœsch 2013-01-08 22:39:25 +01:00
parent a260c79733
commit 119d70db50
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/mux.c
View File

@ -490,13 +490,12 @@ static int compute_pkt_fields2(AVFormatContext *s, AVStream *st, AVPacket *pkt)
*/ */
static inline int split_write_packet(AVFormatContext *s, AVPacket *pkt) static inline int split_write_packet(AVFormatContext *s, AVPacket *pkt)
{ {
int ret; int ret, did_split;
AVPacket spkt = *pkt;
av_packet_split_side_data(&spkt); did_split = av_packet_split_side_data(pkt);
ret = s->oformat->write_packet(s, &spkt); ret = s->oformat->write_packet(s, pkt);
spkt.data = NULL; if (did_split)
av_destruct_packet(&spkt); av_packet_merge_side_data(pkt);
return ret; return ret;
} }