diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 12:37:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 12:44:31 +0200 |
| commit | 3f760214b44bff702f3701a0b13627b3c7153f6f (patch) | |
| tree | b630363b1c614381ffcf691ab67fcd7bebd2b7fd /libavfilter/transform.c | |
| parent | 4149981b376d010f99864dc54ff2f7013ccf0a9f (diff) | |
| parent | 68b467742092364f9306283f40effde2c12efe08 (diff) | |
| download | ffmpeg-3f760214b44bff702f3701a0b13627b3c7153f6f.tar.gz | |
Merge commit '68b467742092364f9306283f40effde2c12efe08'
* commit '68b467742092364f9306283f40effde2c12efe08':
lavf: Make probe_codec return an error code
Conflicts:
libavformat/utils.c
A failure to reallocate should not free the array as it is used
to probe the codec. And failure to reallocate if the following
probe succeeds isnt a fatal error for probe_codec(). Thus this
is only partially merged to ensure probing still is attempted
with the data available.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/transform.c')
0 files changed, 0 insertions, 0 deletions