Merge remote branch 'qatar/master'
* qatar/master:
lavf: bump minor and add an APIChanges entry for avformat cleanup
lavf: get rid of ffm-specific stuff in avformat.h
Not pulled: avio: deprecate av_protocol_next().
avio: add a function for iterating though protocol names.
lavf: rename a parameter of av_sdp_create from buff->buf
lavf: rename avf_sdp_create to av_sdp_create.
lavf: make av_guess_image2_codec internal
avio: make URLProtocol internal.
avio: make URLContext internal.
lavf: mark av_pkt_dump(_log) for remove on $next+1 bump.
lavf: use designated initializers for all protocols
applehttp: don't use deprecated url_ functions.
avio: move two ff_udp_* functions from avio_internal to url.h
asfdec: remove a forgotten declaration of nonexistent function
avio: deprecate the typedef for URLInterruptCB
Merged-by:
Michael Niedermayer <michaelni@gmx.at>
Showing
- doc/APIchanges 5 additions, 0 deletionsdoc/APIchanges
- ffmpeg.c 3 additions, 1 deletionffmpeg.c
- ffserver.c 2 additions, 1 deletionffserver.c
- libavformat/applehttp.c 8 additions, 8 deletionslibavformat/applehttp.c
- libavformat/applehttpproto.c 5 additions, 7 deletionslibavformat/applehttpproto.c
- libavformat/asfdec.c 0 additions, 2 deletionslibavformat/asfdec.c
- libavformat/avformat.h 13 additions, 11 deletionslibavformat/avformat.h
- libavformat/avio.c 12 additions, 2 deletionslibavformat/avio.c
- libavformat/avio.h 23 additions, 6 deletionslibavformat/avio.h
- libavformat/avio_internal.h 1 addition, 4 deletionslibavformat/avio_internal.h
- libavformat/concat.c 5 additions, 6 deletionslibavformat/concat.c
- libavformat/ffm.h 5 additions, 0 deletionslibavformat/ffm.h
- libavformat/file.c 11 additions, 10 deletionslibavformat/file.c
- libavformat/gopher.c 5 additions, 6 deletionslibavformat/gopher.c
- libavformat/http.c 8 additions, 8 deletionslibavformat/http.c
- libavformat/http.h 1 addition, 1 deletionlibavformat/http.h
- libavformat/img2.c 8 additions, 0 deletionslibavformat/img2.c
- libavformat/internal.h 2 additions, 0 deletionslibavformat/internal.h
- libavformat/librtmp.c 41 additions, 50 deletionslibavformat/librtmp.c
- libavformat/mms.h 1 addition, 1 deletionlibavformat/mms.h
Loading
Please register or sign in to comment