diff options
| author | Michael Niedermayer | 2013-05-05 12:41:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer | 2013-05-05 12:41:36 +0200 |
| commit | fdccb84e3b94d3710c6aa253ccc68ad01c17cb45 (patch) | |
| tree | 3506062eed74514ea4649485b17f5d7ec318e78f /libavformat/caf.h | |
| parent | f083b4c33883719861c3055033dd35ffce73c6e0 (diff) | |
| parent | c0c2b96c136ec2cbfd808eefc26de399f447d62f (diff) | |
Merge commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f'
* commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f':
sctp: Add a note on why sctp_recvmsg and sctp_sendmsg have ff_-prefixes
avs: Increase magic value score above file extension score
Conflicts:
libavformat/avs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/caf.h')
0 files changed, 0 insertions, 0 deletions