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)
* 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>
1  2 
libavcodec/ptx.c
libavformat/asfdec.c

Simple merge
Simple merge