virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
72,791 Commits 37 Branches 400 Tags 467 MiB
962654f251
Commit Graph

78 Commits

Author SHA1 Message Date
Ramiro Polla
1f0fa80bfa dshow: use DirectShow information to set time_base 
Fixes build after removal of AVFormatParameters.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-03 18:12:29 +01:00
Ramiro Polla
c9e5acad61 dshow: fix AVInputFormat declaration after ABI breakage 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-03 18:11:55 +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
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
Ramiro Polla
d3bc75c666 dshow: support BI_BITFIELDS compression type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-06 16:53:49 +01:00
Ramiro Polla
526a7d855d dshow: don't print min/max values for fps the wrong way around 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-06 01:19:57 +01:00
Ramiro Polla
e3e962835f dshow: save opened device reference so it may be properly closed 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-06 01:19:57 +01:00
Ramiro Polla
21a928d07c dshow: release filter reference obtained from enumeration 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-06 01:19:56 +01:00
Ramiro Polla
5b186148bf dshow: indent 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-06 01:19:56 +01:00
Ramiro Polla
2f9b955918 dshow: support choosing between devices with same name 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-06 01:19:56 +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
Ramiro Polla
6613db9736 dshow: remove filters from graph before releasing them 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2011-09-16 11:16:05 +02:00
Ramiro Polla
a1644f6287 dshow: reset list for each filter removed 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2011-09-16 11:16:05 +02:00
Ramiro Polla
215e197942 dshow: invert condition to avoid leaking objects 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2011-09-16 11:16:05 +02:00
Ramiro Polla
01b997b958 dshow: indent 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2011-09-16 11:09:47 +02:00
Ramiro Polla
0883a7fa3b dshow: add option to list audio/video options 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2011-09-16 11:09:13 +02:00
Ramiro Polla
c4b2027d10 dshow: add audio/video options 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2011-09-16 11:06:56 +02:00
Ramiro Polla
d0da310317 dshow: initialize variable to prevent releasing random data 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2011-09-16 11:02:26 +02:00
Ramiro Polla
ee4ed80485 dshow: factorise cycling through pins 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2011-09-16 11:02:13 +02:00
Ramiro Polla
f0c64d0d0b dshow: indent 
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-09-12 19:22:13 +02:00
Ramiro Polla
1c282f96ab dshow: add option to list devices 
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-09-12 19:22:10 +02:00
Ramiro Polla
fad4e1a572 dshow: factorise cycling through devices 
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-09-12 19:22:06 +02:00
Ramiro Polla
ff5e1b0b7a dshow: properly disconnect and remove filters from graph 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 21:14:51 +02:00
Ramiro Polla
5e77dc2ea7 dshow: remove some unused code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 21:13:06 +02:00
Stefano Sabatini
6b899e16de lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +02:00
Ramiro Polla
a13fec8a9c DirectShow capture: Fix build 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-21 21:53:15 +02:00
Ramiro Polla
95eb2e3a38 DirectShow capture support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-21 17:23:14 +02:00