diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 23:00:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 23:01:52 +0200 |
| commit | b9bfd888e551644c54971220ebf1f37effba4769 (patch) | |
| tree | ae3d52467ef60fe6e847e2aff1b7ce441b25f36c /libavcodec/png.c | |
| parent | 11991a7d9069dc80a0548d1521d227a3233deb1a (diff) | |
| parent | edd5f957646dcbf1bb55718bc7bf1e5481c25bcb (diff) | |
| download | ffmpeg-b9bfd888e551644c54971220ebf1f37effba4769.tar.gz | |
Merge commit 'edd5f957646dcbf1bb55718bc7bf1e5481c25bcb'
* commit 'edd5f957646dcbf1bb55718bc7bf1e5481c25bcb':
output example: use OutputStream for audio streams as well
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/png.c')
0 files changed, 0 insertions, 0 deletions