diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-14 21:53:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-14 21:54:11 +0100 |
| commit | d938a013af7607485eac4d0af1d8f5d08bac778e (patch) | |
| tree | b164ec207870350d068a884578264e30b1b3dd62 /doc/print_options.c | |
| parent | 1171ad647ebfc03b65fd3a02720edb7f20c00169 (diff) | |
| parent | aa0cb16c15a5b30f78542f18e3fa65de005cf084 (diff) | |
| download | ffmpeg-d938a013af7607485eac4d0af1d8f5d08bac778e.tar.gz | |
Merge commit 'aa0cb16c15a5b30f78542f18e3fa65de005cf084'
* commit 'aa0cb16c15a5b30f78542f18e3fa65de005cf084':
mxf: Fix off by one error in d10 aes3 decoding
Conflicts:
libavformat/mxfdec.c
See: 3be02afb56f2a485fcdc747b6c2f77ed03adc6e5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/print_options.c')
0 files changed, 0 insertions, 0 deletions