diff options
| author | Michael Niedermayer <[email protected]> | 2013-09-08 11:40:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-09-08 11:40:45 +0200 |
| commit | 58e5f6a4332077eb7e1cfd8a6a3d0bc59759386d (patch) | |
| tree | d6d4d0ec7615b0cf840e970a28fe97ae51f9238d /libavresample/audio_mix_matrix.c | |
| parent | e3d34100e73c256e250534d64eb5f07daf3d0fef (diff) | |
| parent | 85ac12587bfef970d0e0e4abc292df346daf8478 (diff) | |
oMerge commit '85ac12587bfef970d0e0e4abc292df346daf8478'
* commit '85ac12587bfef970d0e0e4abc292df346daf8478':
nuv: check ff_rtjpeg_decode_frame_yuv420 return value
Conflicts:
libavcodec/nuv.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavresample/audio_mix_matrix.c')
0 files changed, 0 insertions, 0 deletions