diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-22 10:54:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-22 10:59:05 +0100 |
| commit | db05f7ab1626a175ec1aea2d1d64e2e49b632753 (patch) | |
| tree | f3a8fc715399ce5dd1a9b0d3384474ea18fff223 /libavformat/rtmpcrypt.c | |
| parent | b16bf913d8edacc368913fdaa92a23ae7d18d193 (diff) | |
| parent | 311443f6c7eb230276e320f2d30a5d729cf32b76 (diff) | |
| download | ffmpeg-db05f7ab1626a175ec1aea2d1d64e2e49b632753.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: h264: Don't use redzone in AVX h264_deblock on Win64
No code change, as the commit has been already integrated
merge just for metadata
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmpcrypt.c')
0 files changed, 0 insertions, 0 deletions