diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 01:03:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 01:03:19 +0200 |
| commit | 53dcd772aa1f53706f1fa96350a47b90d5c4fe7d (patch) | |
| tree | 4b702a5c70e77e034d232350fadcf9c7faf7db89 /doc/examples/muxing.c | |
| parent | 2f894deeda18bf9162d7ceb96fa83253e331a37e (diff) | |
| parent | f1a8885ae9e7f281b597d1f9188fc16fb2ab7832 (diff) | |
| download | ffmpeg-53dcd772aa1f53706f1fa96350a47b90d5c4fe7d.tar.gz | |
Merge commit 'f1a8885ae9e7f281b597d1f9188fc16fb2ab7832' into release/0.10
* commit 'f1a8885ae9e7f281b597d1f9188fc16fb2ab7832':
doc: Point to the correct, actually maintained gas-preprocessor repo
Conflicts:
doc/platform.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/muxing.c')
0 files changed, 0 insertions, 0 deletions