diff options
| author | Michael Niedermayer <[email protected]> | 2014-05-29 00:20:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-05-29 00:20:48 +0200 |
| commit | d858ee717bed6307b8e772bd5039ab001aeae03f (patch) | |
| tree | 2e8d510d7c759cf58cb178c55409340bab048161 /libavresample/avresample.h | |
| parent | b50559fc0b2bb4c1ac85aad2e9b0122fe4ec53a3 (diff) | |
| parent | 6d212599aa684f30511fb08ca30fe2378405304e (diff) | |
Merge commit '6d212599aa684f30511fb08ca30fe2378405304e'
* commit '6d212599aa684f30511fb08ca30fe2378405304e':
avformat: Provide a standard compliance flag
Conflicts:
doc/APIchanges
libavformat/avformat.h
libavformat/version.h
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavresample/avresample.h')
0 files changed, 0 insertions, 0 deletions