Changeset 5f268ca5 in ffmpeg
- Timestamp:
-
Nov 13, 2011, 11:33:39 PM
(13 years ago)
- Author:
- Michael Niedermayer <michaelni@gmx.at>
- Branches:
- master
- Children:
- b1b0fd27
- Parents:
- 4fa6e9d0 (diff), 32caa7b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
- git-author:
- Michael Niedermayer <michaelni@gmx.at> (11/13/11 22:43:12)
- git-committer:
- Michael Niedermayer <michaelni@gmx.at> (11/13/11 23:33:39)
- Message:
-
Merge remote-tracking branch 'qatar/master'
- qatar/master:
lavf: pass options from AVFormatContext to avio.
avformat: Use avio_open2, pass the AVFormatContext interrupt_callback onwards
avio: add avio_open2, taking an interrupt callback and options
avio: add support for passing options to protocols.
avio: add and use ffurl_protocol_next().
avformat: Pass the interrupt callback on to chained muxers/demuxers
avio: Add an AVIOInterruptCB parameter to ffurl_open/ffurl_alloc
avformat: Use ff_check_interrupt
avio: Add an internal utility function for checking the new interrupt callback
avio: Add AVIOInterruptCB
texi2html: remove stray \n
doc: prettyfy the texi2html documentation
swscale: handle unaligned buffers in yuv2plane1
Conflicts:
libavformat/avformat.h
libavformat/avio.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-
(No files)
-
