diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-22 00:17:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-22 00:26:37 +0200 |
| commit | 42316907b874fc7bc73ec227d2ad21774a662fc9 (patch) | |
| tree | a7443915b2a618615ec02847b706595b4a36363a /libavcodec/proresdsp.c | |
| parent | dd3f1563d7666b631035644ea690c20b00ec91de (diff) | |
| parent | af7ca6ea124b82b337a6b96e10963e88eba57ebe (diff) | |
| download | ffmpeg-42316907b874fc7bc73ec227d2ad21774a662fc9.tar.gz | |
Merge commit 'af7ca6ea124b82b337a6b96e10963e88eba57ebe'
* commit 'af7ca6ea124b82b337a6b96e10963e88eba57ebe':
nutdec: check av_new_packet return value
Conflicts:
libavformat/nutdec.c
See: bb502411ddb9fe1928d4a999693a3a49b83f8698
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/proresdsp.c')
0 files changed, 0 insertions, 0 deletions