diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 13:50:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 13:50:33 +0200 |
| commit | 15fbf3e72a643b6b3d32ab6fa687ca2ca3d2fde1 (patch) | |
| tree | 3e97f6203b68a353deb5fe88cabd562c024ed1ca /ffmpeg_opt.c | |
| parent | edd110ee4526849da487bb6be9c63fc77cb5a65a (diff) | |
| parent | ab7b038906f3e40ed474676d8e3029902a2078f5 (diff) | |
Merge commit 'ab7b038906f3e40ed474676d8e3029902a2078f5'
* commit 'ab7b038906f3e40ed474676d8e3029902a2078f5':
avconv: factor out the output stream initialization
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions