diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-14 22:16:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-14 22:20:52 +0100 |
| commit | e3c0fcaddabe91dfcfce4f606a576c79be1a6779 (patch) | |
| tree | d31741c7d52a321ef25fc26f54acfa892e5e1834 /libavformat/psxstr.c | |
| parent | 84ca7c28ce4977cbf71b2c7efbaafea9fc3fbfb2 (diff) | |
| parent | 1a4e4ad0e0c5486dcab05e54b587672a498dd7cf (diff) | |
| download | ffmpeg-e3c0fcaddabe91dfcfce4f606a576c79be1a6779.tar.gz | |
Merge commit '1a4e4ad0e0c5486dcab05e54b587672a498dd7cf'
* commit '1a4e4ad0e0c5486dcab05e54b587672a498dd7cf':
mxf: Use av_malloc_array
Conflicts:
libavformat/mxfdec.c
See: 8ce41721a4a29711211f8dad0c86502caf86f4d3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/psxstr.c')
0 files changed, 0 insertions, 0 deletions