diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-24 11:51:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-24 11:53:47 +0100 |
| commit | 4c6f08bd8f3c6e4847e5791cd95e17c1016e30db (patch) | |
| tree | cc54e86931064d25171aeeeb7c7b7f5c17320073 | |
| parent | 01a334e8857d79a37a252d0c9831fde134dcb613 (diff) | |
| parent | 285ff14413718ef70b3d992be24472c12cbc481c (diff) | |
| download | ffmpeg-4c6f08bd8f3c6e4847e5791cd95e17c1016e30db.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: Change a missed occurrance of int to ptrdiff_t for strides
x86: Remove win64 xmm clobbering wrappers for the now removed avcodec_encode_video function
bktr: Add missing includes for av_gettime()
fate: use little endian yuv444p10 in h264-reinit tests
Nothing changes through this merge as the 3 bugfixes already exist
in ffmpeg and the clobbering wraper is still in use as we did not
yet remove avcodec_encode_video
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions