diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 12:35:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 12:41:04 +0200 |
| commit | b7fc2693c70fe72936e4ce124c802ac23857c476 (patch) | |
| tree | 6633a69bc7ab53e1478bb2210e25b834da038aa5 /libavcodec/vdpau_internal.h | |
| parent | 6d77279ed81c5db8a9f7b895d5090c0328c12174 (diff) | |
| parent | 488a0fa68973d48e264d54f1722f7afb18afbea7 (diff) | |
Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'
* commit '488a0fa68973d48e264d54f1722f7afb18afbea7':
avconv: support -t as an input option.
Conflicts:
Changelog
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vdpau_internal.h')
0 files changed, 0 insertions, 0 deletions