diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-14 22:03:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-14 22:03:32 +0100 |
| commit | 84ca7c28ce4977cbf71b2c7efbaafea9fc3fbfb2 (patch) | |
| tree | b164ec207870350d068a884578264e30b1b3dd62 /doc/print_options.c | |
| parent | d938a013af7607485eac4d0af1d8f5d08bac778e (diff) | |
| parent | f5fbbbc022f723d3ccf99afd5d658a977b51c08a (diff) | |
| download | ffmpeg-84ca7c28ce4977cbf71b2c7efbaafea9fc3fbfb2.tar.gz | |
Merge commit 'f5fbbbc022f723d3ccf99afd5d658a977b51c08a'
* commit 'f5fbbbc022f723d3ccf99afd5d658a977b51c08a':
mxf: Drop unnecessary checks
Conflicts:
libavformat/mxfdec.c
See: c5714097eb4c5545f41b5dcb522f7d7470d6f733
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/print_options.c')
0 files changed, 0 insertions, 0 deletions