Michael Niedermayer
72bbe768ba
devices: Disable v4l to fix compilation until someone
...
has time to update it to the new API.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-28 08:44:33 +01:00
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
Alex Converse
7181c4edee
cosmetics: Remove extra newlines at EOF
2012-01-27 17:19:09 -08:00
Michael Niedermayer
f21b6159cf
mpegvideoenc: Fail if a buffer size is specified without a max rate.
...
This combination makes not much sense.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-28 01:36:44 +01:00
Michael Niedermayer
49f2056289
pngdec: Convert 2/4 bit formats to 8bit.
...
This way 2 and 4 bit gray, rgb & rgba are supported.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-28 01:36:43 +01:00
Michael Niedermayer
eb3f81e4ef
targadec: Simplify RLE out of packet check.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-28 01:36:42 +01:00
Paul B Mahol
f9ca1ac796
sws/pixfmt/pixdesc: add support for yuva444p
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Conflicts:
libavutil/avutil.h
libavutil/pixfmt.h
2012-01-28 01:30:41 +01:00
Martin Storsjö
e771e6dd63
movenc: Allow writing to a non-seekable output if using empty moov
...
In this mode, no seeks will be done except for within moov/moof
fragments, which should fit within the AVIOContext buffer.
This allows pushing live smooth streaming format data to
a live publishing point on IIS over http.
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-01-27 21:12:41 +02:00
Martin Storsjö
f532210499
movenc: Support adding isml (smooth streaming live) metadata
...
This metadata is required for pushing a live stream to an IIS
publishing point.
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-01-27 21:12:28 +02:00
Martin Storsjö
9a7dc618c5
libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set
...
Earlier, calling avcodec_encode_audio worked fine even if time_base
wasn't set. Now it crashes due to trying to scale the output pts to
the codec context time base. This affects e.g. VLC.
If no time_base is set for audio codecs, set it to the sample
rate.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-01-27 20:52:32 +02:00
Aneesh Dogra
bca77a1a64
sunrast: Document the different Sun Raster file format types.
...
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
2012-01-27 13:21:46 -05:00
Aneesh Dogra
1bbb173652
sunrast: Add a check for experimental type.
...
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
2012-01-27 11:35:39 -05:00
Justin Ruggles
2c577155a7
libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat
...
Fixes build with --enable-libspeex
2012-01-27 11:28:21 -05:00
Anton Khirnov
c5254755c0
lavf: remove disabled FF_API_SET_PTS_INFO cruft
2012-01-27 10:52:43 +01:00
Anton Khirnov
374e469b8d
lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft
2012-01-27 10:52:43 +01:00
Anton Khirnov
bf868727d7
lavf: remove disabled FF_API_REORDER_PRIVATE cruft
2012-01-27 10:52:43 +01:00
Anton Khirnov
fd87ba3220
lavf: remove disabled FF_API_SEEK_PUBLIC cruft
2012-01-27 10:52:43 +01:00
Anton Khirnov
bd4c51312b
lavf: remove disabled FF_API_STREAM_COPY cruft
2012-01-27 10:52:43 +01:00
Anton Khirnov
2a0f868cfa
lavf: remove disabled FF_API_PRELOAD cruft
2012-01-27 10:52:43 +01:00
Anton Khirnov
1329827e79
lavf: remove disabled FF_API_NEW_STREAM cruft
2012-01-27 10:52:43 +01:00
Anton Khirnov
adad5b88f8
lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft
2012-01-27 10:52:43 +01:00
Anton Khirnov
f0cb13958d
lavf: remove disabled FF_API_MUXRATE cruft
2012-01-27 10:52:43 +01:00
Anton Khirnov
2f5e728b58
lavf: remove disabled FF_API_FILESIZE cruft
2012-01-27 10:52:43 +01:00
Anton Khirnov
df0bb26aca
lavf: remove disabled FF_API_TIMESTAMP cruft
2012-01-27 10:52:42 +01:00
Anton Khirnov
3bbfd3026c
lavf: remove disabled FF_API_LOOP_OUTPUT cruft
2012-01-27 10:52:42 +01:00
Anton Khirnov
6dc345555f
lavf: remove disabled FF_API_LOOP_INPUT cruft
2012-01-27 10:52:42 +01:00
Anton Khirnov
b32e30faa1
lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft
2012-01-27 10:52:42 +01:00
Anton Khirnov
2d70912cc2
lavf: remove disabled FF_API_FLAG_RTP_HINT cruft
2012-01-27 10:52:42 +01:00
Anton Khirnov
1d911bb404
lavf: remove disabled FF_API_SDP_CREATE cruft
2012-01-27 10:52:42 +01:00
Anton Khirnov
64f6f6f836
lavf: remove disabled FF_API_GUESS_IMG2_CODEC cruft
2012-01-27 10:52:42 +01:00
Anton Khirnov
21824e5b88
lavf: remove disabled FF_API_PKT_DUMP cruft
2012-01-27 10:52:42 +01:00
Anton Khirnov
cc10ab79ec
lavf: remove disabled FF_API_FIND_INFO_TAG cruft
2012-01-27 10:52:42 +01:00
Anton Khirnov
ecd5f41a06
lavf: remove disabled FF_API_PARSE_DATE cruft
2012-01-27 10:52:42 +01:00
Anton Khirnov
997420abf2
lavf: remove disabled FF_API_DUMP_FORMAT cruft
2012-01-27 10:52:42 +01:00
Anton Khirnov
2fb7501938
lavf: remove disabled FF_API_FORMAT_PARAMETERS cruft
...
Also remove now unused AVFormatParameters struct and
AVOutputFormat.set_parameters().
2012-01-27 10:52:42 +01:00
Anton Khirnov
38233fc131
lavf: remove disabled FF_API_OLD_METADATA2 cruft
2012-01-27 10:52:42 +01:00
Anton Khirnov
2439f2ca82
lavf: remove disabled FF_API_OLD_AVIO cruft
2012-01-27 10:52:42 +01:00
Anton Khirnov
a17479dfce
lavf: increase major version from 53 to 54.
2012-01-27 10:52:39 +01:00
Anton Khirnov
6e9651d106
lavf: remove AVFormatParameters from AVFormatContext.read_header signature
2012-01-27 10:51:57 +01:00
Anton Khirnov
3b4aaa6190
lavc: remove disabled FF_API_AVFRAME_AGE cruft.
2012-01-27 10:38:35 +01:00
Anton Khirnov
d803775e81
lavc: remove disabled FF_API_DATA_POINTERS cruft.
2012-01-27 10:38:35 +01:00
Anton Khirnov
10e1ae5eff
lavc: remove disabled FF_API_TIFFENC_COMPLEVEL cruft.
2012-01-27 10:38:35 +01:00
Anton Khirnov
370e923e0b
lavc: remove disabled FF_API_INTERNAL_CONTEXT cruft.
2012-01-27 10:38:35 +01:00
Anton Khirnov
ac84395d6a
lavc: remove disabled FF_API_PARSE_FRAME cruft.
2012-01-27 10:38:34 +01:00
Anton Khirnov
8b9b6041d7
lavc: remove disabled FF_API_GET_ALPHA_INFO cruft.
2012-01-27 10:38:34 +01:00
Anton Khirnov
99ace37e68
lavc: remove disabled FF_API_MJPEG_GLOBAL_OPTS cruft.
2012-01-27 10:38:34 +01:00
Anton Khirnov
96e9b96fcd
lavc: remove disabled FF_API_SNOW_GLOBAL_OPTS cruft.
2012-01-27 10:38:34 +01:00
Anton Khirnov
b9de160c3e
lavc: remove disabled FF_API_LAME_GLOBAL_OPTS cruft.
2012-01-27 10:38:34 +01:00
Anton Khirnov
3211932c51
lavc: remove disabled FF_API_AVCODEC_INIT cruft.
2012-01-27 10:38:34 +01:00
Anton Khirnov
491f443e1f
lavc: remove disabled FF_API_ER cruft.
2012-01-27 10:38:34 +01:00
