virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
34,955 Commits 37 Branches 400 Tags 460 MiB
856b33f578
Commit Graph

10 Commits

Author SHA1 Message Date
Michael Niedermayer
a72580fc9e Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  binkvideo: simplify and remove invalid shifts
  pulse: compute frame_duration once and fix it
  lavf: simplify format_child_class_next()
  hwaccel: OS X Video Decoder Acceleration (VDA) support.
  doc: add support for an optional navigation bar in texi2html pages

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/vda.c
	libavcodec/vda.h
	libavcodec/vda_h264.c
	libavcodec/vda_internal.h
	libavcodec/version.h
	libavformat/options.c
	libavutil/avutil.h
	libavutil/pixfmt.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-15 03:13:42 +01:00
Luca Barbato
2625b621ce pulse: compute frame_duration once and fix it 
The frame duration was calculated without taking in account the
bytes per sample.

Thanks to Lorenzo Pistone <blaffablaffa@gmail.com> for pointing
the issue and providing an initial fix.
 2011-11-14 16:16:41 +01:00
Michael Niedermayer
8d4e44993a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc: remove "legacy" mpegvideo decoder.
  iv8: assemble packets to return complete frames
  pulse: documentation
  pulse: introduce pulseaudio input
  remove the zork pcm seek test

Conflicts:
	configure
	libavdevice/Makefile
	libavdevice/alldevices.c
	libavdevice/avdevice.h
	libavdevice/pulse.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-28 03:05:16 +02:00
Michael Niedermayer
c2553a5585 Merge remote-tracking branch 'luzero/pulse' 
* luzero/pulse:
  pulse: set the device from the avformat filename

Conflicts:
	libavdevice/pulse.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-27 19:46:53 +02:00
Luca Barbato
0de9c41ff4 pulse: introduce pulseaudio input 
It currently use the simple api and is using the latency information
provided only to offset the stream start.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-10-26 16:39:33 -07:00
Luca Barbato
94619d5e55 pulse: set the device from the avformat filename 
Cleanup the options and add explicit fragment_size avoption.
 2011-10-25 18:27:22 -07:00
Michael Niedermayer
f5fdb12d55 pulse: Change application name to LIBAVFORMAT_IDENT 
This should be changed to LIBAVDEVICE_IDENT once it exists.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-26 01:00:45 +02:00
Michael Niedermayer
8646d610ff pulse: fix application name 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-22 02:11:50 +02:00
Luca Barbato
796cd225da pulse: cosmetics 2011-10-19 16:16:21 -07:00
Luca Barbato
f5b0938169 pulse: introduce pulseaudio input 
It currently use the simple api and is using the latency information
provided only to offset the stream start.
 2011-10-19 15:43:30 -07:00