diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 05:33:35 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 05:34:05 +0300 |
| commit | 4cd4a6de4f976a5bf79b564daa23c97cce545caf (patch) | |
| tree | d0aa23553a479abf04ba24cbd3fcf53f2d48db58 /libavcodec/internal.h | |
| parent | cdbebae44440bea97f300f256d722c1495753bc2 (diff) | |
| parent | 2007082d2db25f9305b8a345798b840ea7784fdb (diff) | |
Merge commit '2007082d2db25f9305b8a345798b840ea7784fdb'
* commit '2007082d2db25f9305b8a345798b840ea7784fdb':
mov: check ff_get_wav_header() return value
Conflicts:
libavformat/mov.c
See: 6d55a40b00801899f7975b22401bdd96bbc228af
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/internal.h')
0 files changed, 0 insertions, 0 deletions