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 |
|
Michael Niedermayer
|
b39e01a6e8
|
clenaup: #ifdec CONFIG*
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2011-12-13 21:08:43 +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
|
eef3ea8c71
|
Rename remaining ByteIOContext to AVIOContext.
|
2011-11-14 07:22:30 +01:00 |
|
Vladimir Voroshilov
|
02fa529539
|
Fix deprecated warnings in .bit (de)muxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2011-10-30 15:39:26 +01:00 |
|
Carl Eugen Hoyos
|
7e05542aea
|
Add Vladimir Voroshilov's copyright header to bit.c.
|
2011-10-29 13:16:47 +02:00 |
|
Michael Niedermayer
|
647ec6fc03
|
bit: require at least 1 frame for probing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2011-10-16 02:43:36 +02:00 |
|
Michael Niedermayer
|
ba9d174851
|
bit: remove more unused variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2011-09-25 12:29:20 +02:00 |
|
Michael Niedermayer
|
136a663ceb
|
bit: use AVERROR_INVALIDDATA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2011-09-25 12:29:20 +02:00 |
|
Clément Bœsch
|
6f8c8fa8af
|
bit: use explicit struct initializers.
|
2011-09-25 10:44:31 +02:00 |
|
Michael Niedermayer
|
bf85b909f6
|
bit: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2011-09-25 05:37:27 +02:00 |
|
Michael Niedermayer
|
a5e8492796
|
bit: set AVPacket.pos
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2011-09-25 05:37:22 +02:00 |
|
Michael Niedermayer
|
fa15b1e7b9
|
bit: loose seekback & wrong bitrate code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2011-09-25 05:33:12 +02:00 |
|
Michael Niedermayer
|
dfc571ff18
|
bit: rewrite probe
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2011-09-25 05:33:09 +02:00 |
|
Michael Niedermayer
|
21922dc5ae
|
bit: replace assert() by proper check.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2011-09-25 05:31:49 +02:00 |
|
Michael Niedermayer
|
fc9d6035c3
|
bit: return AVERROR_EOF on eof.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2011-09-25 05:05:03 +02:00 |
|
Laurent Aimar
|
3b26daedd8
|
Removed debug message in the probe function of bit demuxer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2011-09-25 00:29:44 +02:00 |
|
Vladimir Voroshilov
|
0f2297a9b9
|
Add .bit (de)muxer
|
2011-09-24 22:10:46 +02:00 |
|