diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-05 13:26:01 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-05 13:26:07 +0100 |
commit | 7dad2f7bb9753ba7a4a0cf0f69459dfec151e21c (patch) | |
tree | 20db00a39df3e481f9b797653446ac58dd28f60d /libavcodec/x86/h264_i386.h | |
parent | dccd648f9fa0fbf9b25244d342344a56b181b331 (diff) | |
parent | afada9ac67a4e1f5036dcb1d5d42aaf06c2bd06b (diff) | |
download | ffmpeg-7dad2f7bb9753ba7a4a0cf0f69459dfec151e21c.tar.gz |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix compilation with --disable-protocol=udp
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/h264_i386.h')
0 files changed, 0 insertions, 0 deletions