diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 15:13:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 15:13:16 +0200 |
| commit | 2de2b991cac603cc6ad1ff94c706c64a2232f69b (patch) | |
| tree | 075cf4d142f0d7682b2d4b3f9b4a93da15568e37 /ffmpeg_opt.c | |
| parent | 3791741cf97f6803f7ec1beb8da025f1f779e845 (diff) | |
| parent | dc40d88625d7e402d58ac3f3df69fbf27aa31ea0 (diff) | |
Merge commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0'
* commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0':
avconv: do not use poorly defined and undocumented AVStream.pts
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions