diff options
| author | Michael Niedermayer <[email protected]> | 2014-02-04 05:17:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-02-04 05:17:57 +0100 |
| commit | 35bf91c5b55b43f699138c74618afc1f7815ee1c (patch) | |
| tree | f18de050f8b6aefa4f91f789696edad430dd9eb0 /libavutil/timer.h | |
| parent | c06f8bac204a2c8274533f183ad61d2a985f693d (diff) | |
| parent | 8575f5362f98c937758b20ff8512d6767a56208e (diff) | |
Merge commit '8575f5362f98c937758b20ff8512d6767a56208e' into release/1.1
* commit '8575f5362f98c937758b20ff8512d6767a56208e':
lavf: make av_probe_input_buffer more robust
lavf: use a fixed width type
lavf: simplify handling of offset in av_probe_input_buffer()
Conflicts:
libavformat/utils.c
See: cdce0e8a506cafebe47736d891f5b645b57d14b2 and previous commits
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavutil/timer.h')
0 files changed, 0 insertions, 0 deletions