Revision a3040715
ID | a3040715e1f0db1af0c27566a306c4a27ad07dcd |
Parent | 39aafa5e, f0a41afd |
Child | 7aee0899, 280a789f |
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>
Files
- added
- modified
- copied
- renamed
- deleted