diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 12:37:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 12:37:24 +0200 |
| commit | 35a8387b402692933620412d41e2939aca4f6935 (patch) | |
| tree | 968f88f1afd209d6ea4bd782b047925ddc2a99b1 /libavcodec/j2kenc.c | |
| parent | 2ad8056c5e4c30c1c090eacad3d545a1e568235d (diff) | |
| parent | 72fe16a13e3ebd5396ac173bf84c8b20085c16d5 (diff) | |
| download | ffmpeg-35a8387b402692933620412d41e2939aca4f6935.tar.gz | |
Merge commit '72fe16a13e3ebd5396ac173bf84c8b20085c16d5'
* commit '72fe16a13e3ebd5396ac173bf84c8b20085c16d5':
movenc: Use null buffers for measuring the amount of data to be written
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/j2kenc.c')
0 files changed, 0 insertions, 0 deletions