1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Commit Graph

17 Commits

Author SHA1 Message Date
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
Clément Bœsch
539399d4d1 AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*. 2011-10-17 07:33:10 +02:00
Nicolas George
c722c88eb6 libmodplug: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-13 18:08:51 +02:00
Clément Bœsch
92e36ee567 libmodplug: do not call av_expr_parse() in case of no expr specified. 2011-10-10 21:15:26 +02:00
Clément Bœsch
964465eb1a libmodplug: simpler and faster use of eval expr. 2011-10-10 21:09:30 +02:00
Clément Bœsch
86a771143f libmodplug: add bintext video stream capability. 2011-10-10 16:56:48 +02:00
Clément Bœsch
1b3b4a575b libmodplug: free file content buffer in read_close() callback. 2011-10-06 08:50:56 +02:00
Clément Bœsch
8830c4e8a9 libmodplug: add TODO entry for probing. 2011-10-06 08:30:38 +02:00
Clément Bœsch
c768e96668 libmodplug: add metadata support. 2011-10-06 08:30:38 +02:00
Clément Bœsch
e6f937237a libmodplug: add an option to enlarge the max supported file size. 2011-10-06 08:30:37 +02:00
Clément Bœsch
a763b46298 libmodplug: support options (noise reduction, reverb, bass boost, ...) 2011-10-06 08:30:37 +02:00
Clément Bœsch
d7366d918f libmodplug: handle EOF correctly. 2011-10-05 23:45:09 +02:00
Clément Bœsch
9a2ceee2e3 libmodplug: simplify and fix read_packet() callback.
In case of av_new_packet() error, a correct return error code is raised,
the data memcpy is avoided, and pkt dts/pts are not assigned anymore
(since the defaults are good).
2011-10-05 21:25:03 +02:00
Clément Bœsch
5420885737 libmodplug: consistent use of sizeof. 2011-10-05 21:25:02 +02:00
Clément Bœsch
26c7ff9317 Add libmodplug support. 2011-10-04 22:36:33 +02:00