diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 20:56:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 20:56:23 +0200 |
| commit | a9f7972844b70c8e94520f52080884bb1507171f (patch) | |
| tree | 3aeb76548ed23bee55da5a5903a0103093434cdb /libavformat/img2.h | |
| parent | e059ac59efb8001494870af5c6ac72d900846b0b (diff) | |
| parent | 1b04eb20f7e3f0a71f73ba91efcc3d60a435e443 (diff) | |
| download | ffmpeg-a9f7972844b70c8e94520f52080884bb1507171f.tar.gz | |
Merge commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443'
* commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443':
lavc: do not allocate edges in the default get_buffer2()
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/img2.h')
0 files changed, 0 insertions, 0 deletions