aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-20 17:03:58 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-20 17:03:58 +0200
commitafa7ab557a801d54a4c3dbab38350f858efbbd5f (patch)
treed9bb2f47c96a4caecd7beb862c7eac92a2ccfff5 /tools
parent4a993335812f7e9b2088145c7d043c01019c5d04 (diff)
parent452860d7e056f9a894cac2fe52cdedeae4c38251 (diff)
downloadffmpeg-afa7ab557a801d54a4c3dbab38350f858efbbd5f.tar.gz
Merge commit '452860d7e056f9a894cac2fe52cdedeae4c38251'
* commit '452860d7e056f9a894cac2fe52cdedeae4c38251': Use av_packet_rescale_ts() to simplify code. Conflicts: doc/examples/muxing.c ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions