[FFmpeg-cvslog] Merge commit 'dbb1425811a672eddf4acf0513237cdf20f83756'

Michael Niedermayer git at videolan.org
Thu Apr 4 13:25:43 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr  4 13:09:54 2013 +0200| [ab2989378fc59128b7e372fadceeb376c9e8cae0] | committer: Michael Niedermayer

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

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





More information about the ffmpeg-cvslog mailing list