git.sesse.net Git - ffmpeg/commit

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

author	Michael Niedermayer <michaelni@gmx.at>
	Sat, 21 Mar 2015 21:08:19 +0000 (22:08 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Sat, 21 Mar 2015 22:05:34 +0000 (23:05 +0100)
commit	d8151a7e944aea52d167571badc247c8d9972847
tree	00f3d6dcaf271371dc5a2ef284baefb8697d446d	tree \| snapshot
parent	e970b576d28dd515d4ccd665b53763e228816cac	commit \| diff
parent	a12d3188cbec15e22070e139fa5cc541da07e2c3	commit \| diff

Merge commit 'a12d3188cbec15e22070e139fa5cc541da07e2c3'

* commit 'a12d3188cbec15e22070e139fa5cc541da07e2c3':
h264: use a smaller struct for the ref lists

Conflicts:
libavcodec/h264_direct.c
libavcodec/h264_mb.c
libavcodec/h264_picture.c
libavcodec/h264_refs.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/dxva2_h264.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264.h	diff1 \|	diff2 \|	blob \| history
libavcodec/h264_direct.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264_mb.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264_picture.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264_refs.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264_slice.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vaapi_h264.c	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

libavcodec/dxva2_h264.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264.h	diff1 \|	diff2 \|	blob \| history
libavcodec/h264_direct.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264_mb.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264_picture.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264_refs.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264_slice.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vaapi_h264.c	diff1 \|	diff2 \|	blob \| history