[FFmpeg-cvslog] Merge commit 'f0a41afd8a37ebe972436fabfa3d289178bbd83b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 19 02:06:57 2011 +0200| [a3040715e1f0db1af0c27566a306c4a27ad07dcd] | committer: Michael Niedermayer

Merge commit 'f0a41afd8a37ebe972436fabfa3d289178bbd83b'

* commit 'f0a41afd8a37ebe972436fabfa3d289178bbd83b':
Not pulled:  Replace mplayerhq.hu URLs by libav.org.
  asfdec: Remove dead code from asf_read_close().
  ptx: Use av_log_ask_for_sample() where appropriate.

Conflicts:
	libavcodec/utils.c

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

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