diff options
| author | Michael Niedermayer <[email protected]> | 2014-10-07 02:51:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-10-07 02:51:08 +0200 |
| commit | 3726d07a2af8d57f5af57be339c94fe902853e10 (patch) | |
| tree | fe9feefe5d0c1c0d9dd5a56ae42cbd96886d567c /libavcodec/avpacket.c | |
| parent | 4db0e8fd3366eadb2d6374b647b8738208749348 (diff) | |
| parent | 28816050e47b6dba430a52e429d21a864cffda8e (diff) | |
Merge commit '28816050e47b6dba430a52e429d21a864cffda8e'
* commit '28816050e47b6dba430a52e429d21a864cffda8e':
lavf: Set the stream time base hint properly for chained muxers
Conflicts:
libavformat/segment.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/avpacket.c')
0 files changed, 0 insertions, 0 deletions