diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 00:20:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 00:20:48 +0200 |
| commit | d858ee717bed6307b8e772bd5039ab001aeae03f (patch) | |
| tree | 2e8d510d7c759cf58cb178c55409340bab048161 /libavformat/nutenc.c | |
| parent | b50559fc0b2bb4c1ac85aad2e9b0122fe4ec53a3 (diff) | |
| parent | 6d212599aa684f30511fb08ca30fe2378405304e (diff) | |
| download | ffmpeg-d858ee717bed6307b8e772bd5039ab001aeae03f.tar.gz | |
Merge commit '6d212599aa684f30511fb08ca30fe2378405304e'
* commit '6d212599aa684f30511fb08ca30fe2378405304e':
avformat: Provide a standard compliance flag
Conflicts:
doc/APIchanges
libavformat/avformat.h
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nutenc.c')
0 files changed, 0 insertions, 0 deletions