[FFmpeg-cvslog] Merge commit '68b467742092364f9306283f40effde2c12efe08'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 17 12:37:04 2013 +0200| [3f760214b44bff702f3701a0b13627b3c7153f6f] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3f760214b44bff702f3701a0b13627b3c7153f6f
---