diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 13:10:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 13:10:01 +0100 |
| commit | 042eba52a5ff4939b8c548a9fb5e209790c17b37 (patch) | |
| tree | 418842b474845621da39f48de2ceaaee3874aba8 /ffprobe.c | |
| parent | c04c43b3e423d0426162828e7b180e4d0014a3f7 (diff) | |
| parent | 91e8d2eb1f7bf3af949008b106ec1ca037b88b0e (diff) | |
| download | ffmpeg-042eba52a5ff4939b8c548a9fb5e209790c17b37.tar.gz | |
Merge commit '91e8d2eb1f7bf3af949008b106ec1ca037b88b0e'
* commit '91e8d2eb1f7bf3af949008b106ec1ca037b88b0e':
lavf: use the format context strict_std_compliance instead of the codec one
Conflicts:
libavformat/mux.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffprobe.c')
0 files changed, 0 insertions, 0 deletions