diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-21 22:48:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-21 23:01:26 +0200 |
| commit | 840bc8e284c8eead7f0f319e846f911dfb3fd48f (patch) | |
| tree | 6e11272c19fbcc503d168955a50a8f49cc7d7ecd /libavcodec/adpcm_data.h | |
| parent | 6aa1cfed0b2266bb2340644c9e617c69f436fa5c (diff) | |
| parent | 7207dd8f829baee58b4df6c97c19ffde77039e8d (diff) | |
| download | ffmpeg-840bc8e284c8eead7f0f319e846f911dfb3fd48f.tar.gz | |
Merge commit '7207dd8f829baee58b4df6c97c19ffde77039e8d'
* commit '7207dd8f829baee58b4df6c97c19ffde77039e8d':
rmdec: check av_new_packet return value
Conflicts:
libavformat/rmdec.c
See: c01a462cda8d7f298a3ac6d20752d23a11e43a8a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcm_data.h')
0 files changed, 0 insertions, 0 deletions