diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-08 23:43:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-08 23:58:18 +0100 |
| commit | fa14685a578d4d37f9a53c2399bba7770e48f747 (patch) | |
| tree | 7b748d69f420ba6b2fd8a62433b194addf60d1ad /libavformat/webvttenc.c | |
| parent | d5e9fc782150d4596c72440a0aa02b7f4f1254b1 (diff) | |
| parent | 7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f (diff) | |
| download | ffmpeg-fa14685a578d4d37f9a53c2399bba7770e48f747.tar.gz | |
Merge commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f'
* commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f':
avprobe: Export coded_{width,height} in -show_streams
Conflicts:
avprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/webvttenc.c')
0 files changed, 0 insertions, 0 deletions