eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-20 14:00:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '549d0bdca53af7a6e0c612ab4b03baecf3a5878f'

Browse Source 
* commit '549d0bdca53af7a6e0c612ab4b03baecf3a5878f':
  decode: be more explicit about storing the last packet properties

Also copy pkt->size in extract_packet_props(), as it's needed for
AVFrame.pkt_size

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2017-04-22 20:06:47 -03:00
parent 5b281b476b 549d0bdca5
commit 1fd7627770
5 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/pthread_frame.c
View File

@@ -800,7 +800,7 @@ int ff_frame_thread_init(AVCodecContext *avctx)
}
*copy->internal = *src->internal;
copy->internal->thread_ctx = p;
copy->internal->pkt = &p->avpkt;
copy->internal->last_pkt_props = &p->avpkt;
if (!i) {
src = copy;