diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 18:07:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 18:08:30 +0200 |
| commit | 508a5349da9869382803445f8e380751ec43021e (patch) | |
| tree | 326265c58daa160743bcbbbc0c2d95ff393539ac /tools/ffescape.c | |
| parent | 7565aaecb4978cb5903335ffdea5dae21a924494 (diff) | |
| parent | 3dd5c95deef51d7fbf6f4458ba42d1335d2f1472 (diff) | |
| download | ffmpeg-508a5349da9869382803445f8e380751ec43021e.tar.gz | |
Merge commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472'
* commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472':
riff: Move muxing code to a separate file
Conflicts:
configure
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/ffescape.c')
0 files changed, 0 insertions, 0 deletions