diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-05 14:44:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-05 14:44:33 +0200 |
| commit | 42b7bda41a4f7717d41b576e184da2875f7972f2 (patch) | |
| tree | b59e44f9c9d84be410d921400674122958949217 /libavdevice | |
| parent | 6e397074380e64b177e51d5a9ed2a96e1a5b5f7a (diff) | |
| parent | f3a6ad22c977c8fea87c4c5e4535061db6324d66 (diff) | |
| download | ffmpeg-42b7bda41a4f7717d41b576e184da2875f7972f2.tar.gz | |
Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66'
* commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66':
avconv: rename InputStream.opts to InputStream.decoder_opts
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
0 files changed, 0 insertions, 0 deletions