git.sesse.net Git - ffmpeg/commit

]> git.sesse.net Git - ffmpeg/commit

author	James Almer <jamrial@gmail.com>
	Sat, 22 Apr 2017 23:06:47 +0000 (20:06 -0300)
committer	James Almer <jamrial@gmail.com>
	Sat, 22 Apr 2017 23:06:47 +0000 (20:06 -0300)
commit	1fd76277708cf83572ba243e98f9e848c652f83d
tree	a6dc1008a0d893df430a9debbdc201d8e8305954	tree \| snapshot
parent	5b281b476b32c35527c0eea5f42161c4acad83f9	commit \| diff
parent	549d0bdca53af7a6e0c612ab4b03baecf3a5878f	commit \| diff

Merge commit '549d0bdca53af7a6e0c612ab4b03baecf3a5878f'

* 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>

libavcodec/decode.c	diff1 \|	diff2 \|	blob \| history
libavcodec/internal.h	diff1 \|	diff2 \|	blob \| history
libavcodec/pthread_frame.c	diff1 \|	diff2 \|	blob \| history
libavcodec/rawdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/utils.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

libavcodec/decode.c	diff1 \|	diff2 \|	blob \| history
libavcodec/internal.h	diff1 \|	diff2 \|	blob \| history
libavcodec/pthread_frame.c	diff1 \|	diff2 \|	blob \| history
libavcodec/rawdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/utils.c	diff1 \|	diff2 \|	blob \| history