diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 22:49:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 22:49:50 +0200 |
| commit | 037c9c25e6213852e33de5b6e00bbf9d26195938 (patch) | |
| tree | f8c70a3f54015dfe015a1d93670bc846c67c7ebe /libavcodec/hqxdsp.h | |
| parent | e6831c087e49157b64255388cc1bfdb60c76d79e (diff) | |
| parent | 86e1a35802df42f51337d3fed8d5d99d0898c8bf (diff) | |
| download | ffmpeg-037c9c25e6213852e33de5b6e00bbf9d26195938.tar.gz | |
Merge commit '86e1a35802df42f51337d3fed8d5d99d0898c8bf'
* commit '86e1a35802df42f51337d3fed8d5d99d0898c8bf':
h264_ps: Return meaningful error codes and address a memory leak
Conflicts:
libavcodec/h264_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hqxdsp.h')
0 files changed, 0 insertions, 0 deletions