Michael Niedermayer
|
e37f161e66
|
Merge remote-tracking branch 'qatar/master'
* qatar/master: (71 commits)
movenc: Allow writing to a non-seekable output if using empty moov
movenc: Support adding isml (smooth streaming live) metadata
libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set
sunrast: Document the different Sun Raster file format types.
sunrast: Add a check for experimental type.
libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat
lavf: remove disabled FF_API_SET_PTS_INFO cruft
lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft
lavf: remove disabled FF_API_REORDER_PRIVATE cruft
lavf: remove disabled FF_API_SEEK_PUBLIC cruft
lavf: remove disabled FF_API_STREAM_COPY cruft
lavf: remove disabled FF_API_PRELOAD cruft
lavf: remove disabled FF_API_NEW_STREAM cruft
lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft
lavf: remove disabled FF_API_MUXRATE cruft
lavf: remove disabled FF_API_FILESIZE cruft
lavf: remove disabled FF_API_TIMESTAMP cruft
lavf: remove disabled FF_API_LOOP_OUTPUT cruft
lavf: remove disabled FF_API_LOOP_INPUT cruft
lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft
...
Conflicts:
doc/APIchanges
libavcodec/8bps.c
libavcodec/avcodec.h
libavcodec/libx264.c
libavcodec/mjpegbdec.c
libavcodec/options.c
libavcodec/sunrast.c
libavcodec/utils.c
libavcodec/version.h
libavcodec/x86/h264_deblock.asm
libavdevice/libdc1394.c
libavdevice/v4l2.c
libavformat/avformat.h
libavformat/avio.c
libavformat/avio.h
libavformat/aviobuf.c
libavformat/dv.c
libavformat/mov.c
libavformat/utils.c
libavformat/version.h
libavformat/wtv.c
libavutil/Makefile
libavutil/file.c
libswscale/x86/input.asm
libswscale/x86/swscale_mmx.c
libswscale/x86/swscale_template.c
tests/ref/lavf/ffm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2012-01-28 07:53:34 +01:00 |
|
Clément Bœsch
|
215b7724e7
|
lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info().
|
2011-12-03 03:24:32 +01:00 |
|
Clément Bœsch
|
07c7ffc04b
|
Rename remaining get_le32 to avio_rl32.
|
2011-11-14 07:22:31 +01:00 |
|
Clément Bœsch
|
c142e2a00f
|
Rename remaining get_le16 to avio_rl16.
|
2011-11-14 07:22:31 +01:00 |
|
Clément Bœsch
|
7b79305a47
|
Rename remaining url_fskip to avio_skip.
|
2011-11-14 07:22:31 +01:00 |
|
Clément Bœsch
|
055cda8acc
|
Rename remaining get_byte to avio_r8.
|
2011-11-14 07:22:31 +01:00 |
|
Clément Bœsch
|
53d70a334a
|
Rename remaining get_buffer to avio_read.
|
2011-11-14 07:22:30 +01:00 |
|
Clément Bœsch
|
39edfcc9e8
|
Rename remaining url_fseek to avio_seek.
|
2011-11-14 07:22:30 +01:00 |
|
Clément Bœsch
|
eef3ea8c71
|
Rename remaining ByteIOContext to AVIOContext.
|
2011-11-14 07:22:30 +01:00 |
|
Clément Bœsch
|
0e5ecd806e
|
Replace remaining av_new_stream() with avformat_new_stream().
|
2011-11-05 15:07:19 +01:00 |
|
Aurelien Jacobs
|
f3d5840474
|
act: correct file description comment
|
2011-09-26 00:24:01 +02:00 |
|
Aurelien Jacobs
|
c894449fc4
|
act, bintext, wtvenc: use named struct initializers
|
2011-09-26 00:22:41 +02:00 |
|
Michael Niedermayer
|
fb98b71261
|
act: remove AVERROR_NOFMT useage.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2011-09-24 21:11:01 +02:00 |
|
Vladimir Voroshilov
|
6080553e6e
|
ACT demuxer
|
2011-09-24 21:11:01 +02:00 |
|