diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-05 02:46:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-05 02:47:46 +0100 |
| commit | 6a4cc50980783013b19bfb2edaaca14cc38d5c92 (patch) | |
| tree | 44d8de6a502cb408b8ba97f8aaafabf5db4d2941 /libavformat/options_table.h | |
| parent | 2b88cb2f4653e76ba58848ce2564a22501c9c4e9 (diff) | |
| parent | 4c3e1956ee35fdcc5ffdb28782050164b4623c0b (diff) | |
Merge commit '4c3e1956ee35fdcc5ffdb28782050164b4623c0b'
* commit '4c3e1956ee35fdcc5ffdb28782050164b4623c0b':
lagarith: reallocate rgb_planes when needed
Conflicts:
libavcodec/lagarith.c
See: 9eef41b848939a0a86582afdb45235e41612d9ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/options_table.h')
0 files changed, 0 insertions, 0 deletions