Merge commit 'dbb1425811a672eddf4acf0513237cdf20f83756'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 4 Apr 2013 11:09:54 +0000 (13:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 4 Apr 2013 11:24:33 +0000 (13:24 +0200)
commitab2989378fc59128b7e372fadceeb376c9e8cae0
tree5781feee90fe410edfa45f4441ddf152dc356e5e
parente7389ed5d0bd13daf0af9ca7a4b9bc0d21aad9b1
parentdbb1425811a672eddf4acf0513237cdf20f83756
Merge commit 'dbb1425811a672eddf4acf0513237cdf20f83756'

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

Conflicts:
libavformat/utils.c

See: 44a7a6300d104dd453bcd5c601e9c6944fb34679

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/avfiltergraph.c
libavformat/utils.c