diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-12 00:17:23 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-12 00:17:23 -0300 |
| commit | 34cfb73b9928daf3104fe85a961ca3a1389ec076 (patch) | |
| tree | 47e52affc69812ed7264d7b502c1ff63b87f166b /libavcodec/pixlet.c | |
| parent | 362372c46be6f4b885f741271687f2dae6435db9 (diff) | |
| parent | 91760a934055ab06812885ab5ec1a97a8db6d217 (diff) | |
| download | ffmpeg-34cfb73b9928daf3104fe85a961ca3a1389ec076.tar.gz | |
Merge commit '91760a934055ab06812885ab5ec1a97a8db6d217'
* commit '91760a934055ab06812885ab5ec1a97a8db6d217':
dashenc: copy stream frame rate to output stream
This commit is a noop, see 3c838e6442bbe1afb7bf82942471342bcea87a27
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/pixlet.c')
0 files changed, 0 insertions, 0 deletions