Michael Niedermayer ab2989378f Merge commit 'dbb1425811a672eddf4acf0513237cdf20f83756' ...

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

Conflicts:
	libavformat/utils.c

See: 44a7a6300d

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-04-04 13:24:33 +02:00

153 KiB

Raw Blame History

View Raw