diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-12 11:53:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-12 11:53:27 +0200 |
| commit | d3c4ea8b35f7d950c4853952e9044d5c96b0361b (patch) | |
| tree | df2989cede628c8177f32e55944c5c9c74799a6b /libavcodec/alacenc.c | |
| parent | 1163910a00595f01f5f6aabd5d69b01925429401 (diff) | |
| parent | 7dfc3381dd039233026cbba5f3ca3d76e28be860 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
g2meet: do not leak buffers
g2meet: more graceful cursor loading
g2meet: reset dimensions on header parsing errors
Conflicts:
libavcodec/g2meet.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/alacenc.c')
0 files changed, 0 insertions, 0 deletions