diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 18:38:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 18:38:10 +0200 |
| commit | 999a99c865cc12cc69240029b8a280b5ba170b52 (patch) | |
| tree | 76716c81c74a7cac82b4a265b4f6c18b4ce2191f /Makefile | |
| parent | e3c1d9a56c715223284d5bfbcad5cd1f78a798f9 (diff) | |
| parent | a312f71090ee620ee252f2034aef6b13e2dafe9c (diff) | |
| download | ffmpeg-999a99c865cc12cc69240029b8a280b5ba170b52.tar.gz | |
Merge commit 'a312f71090ee620ee252f2034aef6b13e2dafe9c'
* commit 'a312f71090ee620ee252f2034aef6b13e2dafe9c':
lavf: deprecate now unused AVStream.pts
Conflicts:
libavformat/mux.c
libavformat/version.h
mostly not merged as the code is needed for a/vsync drop handling
and what the code does is what is needed, it could maybe be moved
elsewhere or factored somehow but simply removing it would be droping
these features.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions