diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-12 00:50:24 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-12 00:50:24 -0300 |
| commit | ab77c4007b2f662125698569cb2bac2c48851282 (patch) | |
| tree | c94d264d85bea3a917d2b1e554ef84db9ab0f144 /libavcodec/mjpeg_parser.c | |
| parent | f5c67c431ef9d60deb6451d6499e10b9ad510335 (diff) | |
| parent | 22241208eb7d0168b2afc128af5a128a9ef0a89b (diff) | |
| download | ffmpeg-ab77c4007b2f662125698569cb2bac2c48851282.tar.gz | |
Merge commit '22241208eb7d0168b2afc128af5a128a9ef0a89b'
* commit '22241208eb7d0168b2afc128af5a128a9ef0a89b':
avconv.c: fix calculation of input file duration in seek_to_start()
This commit is a noop, see 3ddb887c88483ce089b29a30d0d0aa574c8cdc66
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/mjpeg_parser.c')
0 files changed, 0 insertions, 0 deletions