Merge commit '9f61abc8111c7c43f49ca012e957a108b9cc7610'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 10 Feb 2016 14:40:32 +0000 (14:40 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 10 Feb 2016 14:42:41 +0000 (14:42 +0000)
commitbc9a5965c815cf7fd998d8ce14a18b8e861dd9ce
tree7011642746984633573c9a2d993d58dfd12ee44b
parentd94b11a721385aa406187da8f49380f29be0fa7e
parent9f61abc8111c7c43f49ca012e957a108b9cc7610
Merge commit '9f61abc8111c7c43f49ca012e957a108b9cc7610'

This also deprecates our old duplicated callbacks.

* commit '9f61abc8111c7c43f49ca012e957a108b9cc7610':
  lavf: allow custom IO for all files

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
19 files changed:
doc/APIchanges
libavformat/avformat.h
libavformat/dashenc.c
libavformat/hdsenc.c
libavformat/hls.c
libavformat/hlsenc.c
libavformat/img2dec.c
libavformat/img2enc.c
libavformat/internal.h
libavformat/mlvdec.c
libavformat/mov.c
libavformat/movenc.c
libavformat/options.c
libavformat/segment.c
libavformat/smoothstreamingenc.c
libavformat/tee.c
libavformat/utils.c
libavformat/version.h
libavformat/webm_chunk.c