diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 19:21:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 19:22:00 +0200 |
| commit | 05f1b4e2ecc4683467669a190e3a53df413de805 (patch) | |
| tree | e1c36318eec9815f5329611b2dbb5f906a7e0ea8 /libavcodec/pnmenc.c | |
| parent | 1faece7eccdb35df1cdd5363c4bbc67f6a668755 (diff) | |
| parent | a7d45e06e9757f49ea4e105cbefc3462a7324e9a (diff) | |
| download | ffmpeg-05f1b4e2ecc4683467669a190e3a53df413de805.tar.gz | |
Merge commit 'a7d45e06e9757f49ea4e105cbefc3462a7324e9a'
* commit 'a7d45e06e9757f49ea4e105cbefc3462a7324e9a':
configure: The W64 demuxer should select the WAV demuxer, not depend on it
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pnmenc.c')
0 files changed, 0 insertions, 0 deletions