RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-27 09:52:17 +00:00
Code Issues Projects Releases Wiki Activity
54,252 Commits 37 Branches 400 Tags 245 MiB
8738d94274
Commit Graph

690 Commits

Author SHA1 Message Date
Michael Niedermayer
1ee8fadb81 avdevice/x11grab: allocate just one Cursor 
Fixes resource leak and Ticket2450

Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-21 12:00:11 +02:00
Stefano Sabatini
9f8937b5ef lavd: add xv output device 
Based on the work of Jeff Moguillansky <Jeff.Moguillansky@am.sony.com>.

See thread:
Subject: [FFmpeg-devel] x11 output device for libavdevice
Date: Wed, 10 Apr 2013 23:10:47 +0000
 2013-05-30 10:44:54 +02:00
Clément Bœsch
165bc9caa2 v4l2: make possible to disable libv4l2 at runtime. 
Also disable it by default since it looks currently buggy. The
usefulness of such library is mostly limited to backward compatibility
with very old devices.
 2013-05-22 19:49:29 +02:00
Clément Bœsch
9a7f1519aa lavd/v4l2enc: check write return value. 2013-05-20 16:33:21 +02:00
Clément Bœsch
16a75eaa20 lavd: add v4l2 outdev. 2013-05-20 01:11:33 +02:00
Clément Bœsch
8eec655320 lavd/v4l2: move pixel format conversion code to a separate place. 
This will be shared with the output device.
 2013-05-20 01:11:28 +02:00
Michael Niedermayer
efc08e00cc Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110' 
* commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110':
  vf_aspect: use the name 's' for the pointer to the private context
  Remove commented-out debug #define cruft

Conflicts:
	libavcodec/4xm.c
	libavcodec/dvdsubdec.c
	libavcodec/ituh263dec.c
	libavcodec/mpeg12.c
	libavfilter/avfilter.c
	libavfilter/vf_aspect.c
	libavfilter/vf_fieldorder.c
	libavformat/rtmpproto.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-16 09:56:43 +02:00
Diego Biurrun
2832ea26f3 Remove commented-out debug #define cruft 2013-05-16 00:23:30 +02:00
Michael Niedermayer
c7c71f95f8 replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_* 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 11:23:14 +02:00
Michael Niedermayer
0104570fb6 Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7' 
* commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7':
  silly typo fixes

Conflicts:
	doc/protocols.texi
	libavcodec/aacpsy.c
	libavformat/utils.c
	tools/patcheck

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-04 10:17:52 +02:00
Diego Biurrun
a5f8873620 silly typo fixes 2013-05-03 18:26:12 +02:00
Michael Niedermayer
9b595e86e3 avdevice/lavfi: add error checking for av_opt_set_int_list() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 20:39:07 +02:00
Michael Niedermayer
3fc7b47145 buffersink: switch from opaque to AVOptions for params 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 13:47:40 +02:00
Michael Niedermayer
a1e7e02eaf abuffersink: switch from opaque to AVOptions for params 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 13:38:00 +02:00
Nicolas George
9dd54d7422 lavd/v4l2: fully init an ioctl argument. 
Silence a valgrind warning about uninitialized memory.
 2013-04-01 10:38:14 +02:00
Giorgio Vazzana
5009863ab5 lavd/v4l2: fix printing of list_formats table 
In particular we needed a '\n' at the end of the line when the format is emulated.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-28 16:17:42 +01:00
Giorgio Vazzana
b97f7d9d24 lavd/v4l2: replace ioctl() with v4l2_ioctl() 
This is consistent with the rest of the file and makes listing of
emulated formats possible when ffmpeg is compiled with libv4l2.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-28 16:17:04 +01:00
Michael Niedermayer
ea4c99de4c dshow_pin: dont return a value from a void function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-25 22:12:07 +01:00
Martin Storsjö
fdaacc5932 sndio_dec: Add missing includes for av_gettime() 
This is necessary after the old av_gettime in libavformat was
dropped.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-24 13:20:53 +02:00
Martin Storsjö
fe2661121e bktr: Add missing includes for av_gettime() 
This is necessary after the old av_gettime in libavformat was
dropped.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-23 23:36:58 +02:00
Giorgio Vazzana
785b849f1c lavd/v4l2: honor previously selected input channel 
An input channel could have been previously set with another application, like
v4l2-ctl, so if no input channel is specified use the previosly selected one.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-23 13:43:56 +01:00
Clément Bœsch
d4982b115d lavd/dshow: fix style and typo recently introduced. 2013-03-19 21:26:24 +01:00
dronus
fdca977a22 libavdevice sdl: added window_fullscreen option to switch SDL output into fullscreen mode 2013-03-18 20:44:21 +01:00
Paul B Mahol
79b1835726 sndio_dec: add missing #include for av_gettime() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-17 11:10:26 +00:00
Giorgio Vazzana
bcd3eb3e7a lavd/v4l2: silence libv4l2 logging 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-16 02:44:36 +01:00
Nicolas George
b90912be68 lavd/lavfi: upgrade to AVFrame. 
Fix a memory leak because the compat implementation of
AV_BUFFERSINK_FLAG_PEEK is not identical to the previous one.
 2013-03-15 20:46:27 +01:00
Michael Niedermayer
2ffa9e611e avdevice: bump major 
Our previous release (1.1) contained a version 54 libavdevice
and this version here is not ABI compatible thus a bump is
needed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-14 13:53:41 +01:00
Paul B Mahol
b3b46cd74e bktr: add missing #include for av_gettime() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-13 10:48:09 +00:00
Nicolas George
ceac5c54dd Remove references to the "ff" variant of buffersink. 2013-03-12 23:31:07 +01:00
Giorgio Vazzana
ee4a658695 lavd/v4l2: fix bug in init_convert_timestamp() 
The current code returned a period=0, resulting in identical pts for all frames
after time-filtering. This is because AV_TIME_BASE_Q={1, AV_TIME_BASE} and
not {AV_TIME_BASE, 1}. With this patch the correct period in microseconds is computed.
 2013-03-12 17:14:47 +01:00
Michael Niedermayer
a75f01d7e0 Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111' 
* commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111':
  Add the bumps and APIchanges entries for reference counted buffers changes.

Conflicts:
	Changelog
	doc/APIchanges
	libavcodec/version.h
	libavdevice/version.h
	libavfilter/version.h
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 15:35:39 +01:00
Michael Niedermayer
9cf788eca8 avformat/avdevice: add missing time.h includes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-12 15:28:22 +01:00
Giorgio Vazzana
9222978aed lavd/v4l2: simplify code 
struct buff_data contains a pointer to struct video_data, so passing the
file descriptor again is redundant.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-09 16:59:13 +01:00
Giorgio Vazzana
0286b42540 lavd/v4l2: correctly handle error conditions in mmap_read_frame() 
In particular:

1) save errno before it (possibly) gets overwritten by other calls
2) do not forget to enqueue the buffer again in case of error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-09 16:58:53 +01:00
Michael Niedermayer
2653e12520 Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' 
* commit '1afddbe59e96af75f1c07605afc95615569f388f':
  avpacket: use AVBuffer to allow refcounting the packets.

Conflicts:
	libavcodec/avpacket.c
	libavcodec/utils.c
	libavdevice/v4l2.c
	libavformat/avidec.c
	libavformat/flacdec.c
	libavformat/id3v2.c
	libavformat/matroskaenc.c
	libavformat/mux.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 19:12:03 +01:00
Anton Khirnov
d8b31be6ca Add the bumps and APIchanges entries for reference counted buffers changes. 2013-03-08 07:41:49 +01:00
Anton Khirnov
1afddbe59e avpacket: use AVBuffer to allow refcounting the packets. 
This will allow us to avoid copying the packets in many cases.

This breaks ABI.
 2013-03-08 07:33:45 +01:00
Michael Niedermayer
3827734591 v4l2: fix regression that caused ffmpeg to occasionally get stuck 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-02 01:55:08 +01:00
Giorgio Vazzana
0d66268e15 lavd/v4l2: copy frames into normally allocated packets whenever there is just one buffer left available 
This will avoid the possibility that we dequeue more buffers than we
have obtained from the v4l2 driver.

Fixes ticket #1570

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-02 00:50:17 +01:00
Michael Niedermayer
b56e029bdc avformat/lavfi: force probesize to cover at least 30 frames 
This ensures that fps and other values are estimated correctly,
the probesize also is intended to limit disk/protocol reads which
does not apply to lavfi inputs at all.

Fixes Ticket1051

Something similar could be usefull to other input devices

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-28 20:28:59 +01:00
Michael Niedermayer
54b2bddd22 v4l2: try to fix build on BSD 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-18 00:53:17 +01:00
Carl Eugen Hoyos
fdbe7628a9 Add yvu410 as a supported v4l2 input format. 2013-02-17 19:45:58 +01:00
Carl Eugen Hoyos
fdec49cbe8 Add gray16 as a supported v4l2 input format. 2013-02-17 19:44:13 +01:00
rogerdpack
12c71f648c dshow: Fix MSVC support, remove av_export, which was apparently unneeded anyway. 
Also cleanup exported symbols

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-15 00:08:12 +01:00
Stefano Sabatini
f0703b6cba lavd/v4l2: fix error logic when enumerating standards 
Set ret to 0 before enumerating standards in v4l2_set_parameters(), avoid
use of uninitialized variable.

Regression introduced in 60950adc18.
 2013-02-10 20:59:06 +01:00
Stefano Sabatini
60950adc18 lavd/v4l2: implement consistent error handling 
In particular, avoid use of non-thread-safe strerror(), and store errno
before calling av_log().
 2013-02-10 17:09:57 +01:00
Luca Barbato
43e0e0c4e5 libcdio: support recent cdio-paranoia 
Upstream decided to split the paranoia interface and move the headers
accordingly.
 2013-01-17 21:41:18 +01:00
rogerdpack
c916389bd2 dshow: allow for more codec ID's 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2013-01-16 00:23:53 -07:00
rogerdpack
3b9166fc7e dshow: better error reporting 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2013-01-16 00:18:40 -07:00
rogerdpack
6d33026668 dshow: fix log message 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2013-01-16 00:11:15 -07:00