diff options
| author | James Almer <jamrial@gmail.com> | 2019-05-02 13:48:43 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-05-02 13:48:43 -0300 |
| commit | e645d7a6d452df83cedcbb1d6708429ceea156da (patch) | |
| tree | 39680d2feda28341f015b9438c2224d424284f44 /libavformat/pjsdec.c | |
| parent | 67d466d09b105b2b1d3d8da4c21d8975925741ae (diff) | |
| parent | 9485cce6d55baf547e92ef1f54cad117f2a38287 (diff) | |
| download | ffmpeg-e645d7a6d452df83cedcbb1d6708429ceea156da.tar.gz | |
Merge commit '9485cce6d55baf547e92ef1f54cad117f2a38287'
* commit '9485cce6d55baf547e92ef1f54cad117f2a38287':
time_internal: Do not attempt to override *time_r() macros
This commit is a noop, see a604de4fd89e8fe37d2f8163282060fcaa64ee3e
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/pjsdec.c')
0 files changed, 0 insertions, 0 deletions