diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-14 21:37:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-14 21:37:42 +0100 |
| commit | 1171ad647ebfc03b65fd3a02720edb7f20c00169 (patch) | |
| tree | b4af34fb94f11372471c909bb1fc8cdf65998a8a /doc/print_options.c | |
| parent | 8721dda1c57f6fd0f89c01bef89216ace1ec3377 (diff) | |
| parent | 42f9132218ca11a8e9a3c82a175b46bca092113e (diff) | |
| download | ffmpeg-1171ad647ebfc03b65fd3a02720edb7f20c00169.tar.gz | |
Merge commit '42f9132218ca11a8e9a3c82a175b46bca092113e'
* commit '42f9132218ca11a8e9a3c82a175b46bca092113e':
mxf: Do not use int to check the seek position
Conflicts:
libavformat/mxfdec.c
See: 007989c7a2215f54aeaf2393ab3aff0c208e862f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/print_options.c')
0 files changed, 0 insertions, 0 deletions