Merge commit 'f0a41afd8a37ebe972436fabfa3d289178bbd83b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Apr 2011 00:06:57 +0000 (02:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Apr 2011 00:08:35 +0000 (02:08 +0200)
commita3040715e1f0db1af0c27566a306c4a27ad07dcd
tree99f852eb08e20ae2df98d78612f0a085b1649ff7
parent39aafa5ee90e10382e2f991e4d79d7852231df68
parentf0a41afd8a37ebe972436fabfa3d289178bbd83b
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@gmx.at>
libavcodec/ptx.c
libavformat/asfdec.c