diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-19 02:06:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-19 02:08:35 +0200 |
| commit | a3040715e1f0db1af0c27566a306c4a27ad07dcd (patch) | |
| tree | 99f852eb08e20ae2df98d78612f0a085b1649ff7 /libavcodec/mlpdec.c | |
| parent | 39aafa5ee90e10382e2f991e4d79d7852231df68 (diff) | |
| parent | f0a41afd8a37ebe972436fabfa3d289178bbd83b (diff) | |
| download | ffmpeg-a3040715e1f0db1af0c27566a306c4a27ad07dcd.tar.gz | |
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>
Diffstat (limited to 'libavcodec/mlpdec.c')
0 files changed, 0 insertions, 0 deletions