diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-29 22:09:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-29 22:09:56 +0100 |
| commit | a3b1e42ec4f44c4d67a6efcf6f65527b2c952432 (patch) | |
| tree | 9ce553075e6b578101976d6c586073ed10ba7a92 /libavcodec/g722.h | |
| parent | 66b2a3fa31bdc8994effbacca02f167ba8bfe0a5 (diff) | |
| parent | e9ba3098319f78c91470c05da988d865491852c5 (diff) | |
| download | ffmpeg-a3b1e42ec4f44c4d67a6efcf6f65527b2c952432.tar.gz | |
Merge commit 'e9ba3098319f78c91470c05da988d865491852c5'
* commit 'e9ba3098319f78c91470c05da988d865491852c5':
assdec: check av_new_packet return value
Conflicts:
libavformat/assdec.c
See: 7c9f9685ae2d45d5bbb939483a01266622e8f14c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722.h')
0 files changed, 0 insertions, 0 deletions