diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-13 17:23:57 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-13 17:23:57 +0100 |
| commit | f761d4967053352f9b95ac2bc2505ea06d25a2a0 (patch) | |
| tree | e8558c0eb7eaeefc367a80dcea27ba3f7a381bef /libavfilter/asink_anullsink.c | |
| parent | 198e8b8e774659eacaa7058c7f5704029af5bbbf (diff) | |
| parent | 3e265ca58f0505470186dce300ab66a6eac3978e (diff) | |
| download | ffmpeg-f761d4967053352f9b95ac2bc2505ea06d25a2a0.tar.gz | |
Merge commit '3e265ca58f0505470186dce300ab66a6eac3978e'
* commit '3e265ca58f0505470186dce300ab66a6eac3978e':
avconv: do packet ts rescaling in write_packet()
This commit is a noop since it doesn't apply cleanly due to differences
in the dataflow between avconv and ffmpeg, and thus fixing this in the
scope of a merge is unfeasible.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavfilter/asink_anullsink.c')
0 files changed, 0 insertions, 0 deletions