Merge commit '68b467742092364f9306283f40effde2c12efe08'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 10:37:04 +0000 (12:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 10:44:31 +0000 (12:44 +0200)
commit3f760214b44bff702f3701a0b13627b3c7153f6f
treeb630363b1c614381ffcf691ab67fcd7bebd2b7fd
parent4149981b376d010f99864dc54ff2f7013ccf0a9f
parent68b467742092364f9306283f40effde2c12efe08
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>
libavformat/utils.c