* commit 'dbb14258':
  lavf: make sure stream probe data gets freed.
  avfiltergraph: set deprecated filter_count.

Conflicts:
	libavformat/utils.c

See: 44a7a630Merged-by: Michael Niedermayer <michaelni@gmx.at>