[FFmpeg-cvslog] Merge commit '48715285f69d70879353737d7bed049f89f58096'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov  5 12:04:39 2013 +0100| [de970d49fedec75ab068441f72f3cca5c1da28d9] | committer: Michael Niedermayer

Merge commit '48715285f69d70879353737d7bed049f89f58096'

* commit '48715285f69d70879353737d7bed049f89f58096':
  graph2dot: Fix use of deprecated API

See: 59360cd456dd038fb28134aff5d9b56302fff488
See: ecade984ac3ce5205f6276a9329e2b7bca09fa47
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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