Clément Bœsch
|
a19e9f2d5c
|
lavf/microdvd: rewrite using subtitles queue API.
|
2012-06-29 20:20:01 +02:00 |
|
Clément Bœsch
|
608bda925a
|
lavf/{srt,microdvd}: correctly raise error on avformat_new_stream() error.
|
2012-06-15 18:40:14 +02:00 |
|
Clément Bœsch
|
2d52ee8a1a
|
lavf/microdvd: support events lasting to the next one.
Example:
{3350}{}this subtitle...
{3390}{}...continues up to...
{4000}{4500}this one.
{4600}{}and now...
{4800}{}...to the end of the presentation
|
2012-05-29 21:33:28 +02:00 |
|
Clément Bœsch
|
e40981b8c4
|
lavf/microdvd: set packet duration.
|
2012-04-27 19:19:36 +02: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 |
|
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
|
0e5ecd806e
|
Replace remaining av_new_stream() with avformat_new_stream().
|
2011-11-05 15:07:19 +01:00 |
|
Aurelien Jacobs
|
3c9bfb3368
|
add MicroDVD muxer and demuxer
Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
|
2011-04-04 01:29:40 +02:00 |
|