Merge commit '8de1ee9f725aa3c550f425bd3120bcd95d5b2ea8'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:37:48 +0000 (14:37 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:37:48 +0000 (14:37 +0100)
commit611c22140a54db0baa863b26368e12d3a1d8267e
tree559b65b68d30e12abfb199277b6119c58df81627
parentc03ffe1712e65b2f18d090d34db95ef18340bd0e
parent8de1ee9f725aa3c550f425bd3120bcd95d5b2ea8
Merge commit '8de1ee9f725aa3c550f425bd3120bcd95d5b2ea8'

* commit '8de1ee9f725aa3c550f425bd3120bcd95d5b2ea8':
  lavf: deprecate compute_pkt_fields2

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavformat/avformat.h
libavformat/internal.h
libavformat/mux.c
libavformat/utils.c
libavformat/version.h