generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
65,710 Commits 24 Branches 241 Tags 173 MiB
c0d18cc085
Commit Graph

906 Commits

Author SHA1 Message Date
Michael Niedermayer
fb33bff990 Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39' 
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39':
  cosmetics: Write NULL pointer equality checks more compactly

Conflicts:
	cmdutils.c
	ffmpeg_opt.c
	ffplay.c
	libavcodec/dvbsub.c
	libavcodec/dvdsubdec.c
	libavcodec/dvdsubenc.c
	libavcodec/dxa.c
	libavcodec/libxvid_rc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/rv10.c
	libavcodec/tiffenc.c
	libavcodec/utils.c
	libavcodec/vc1dec.c
	libavcodec/zmbv.c
	libavdevice/v4l2.c
	libavformat/matroskadec.c
	libavformat/movenc.c
	libavformat/sdp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-15 21:00:50 +02:00
Michael Niedermayer
3eba0a9190 Merge commit 'a6a27fede94efe48aad1dcc9d5e000d2de71c7b2' 
* commit 'a6a27fede94efe48aad1dcc9d5e000d2de71c7b2':
  vfwcap: Replace deprecated av_destruct_packet() by av_free_packet()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-15 12:45:35 +02:00
Gabriel Dume
f929ab0569 cosmetics: Write NULL pointer equality checks more compactly 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-08-15 03:18:18 -07:00
Diego Biurrun
a6a27fede9 vfwcap: Replace deprecated av_destruct_packet() by av_free_packet() 2014-08-15 09:53:02 +02:00
Michael Niedermayer
a57ece0cb4 Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8' 
* commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8':
  Bump major versions of all libraries.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 00:26:45 +02:00
Anton Khirnov
1985c2e75c Bump major versions of all libraries. 2014-08-09 16:58:33 +00:00
Michael Niedermayer
75bd83d448 avdevice/lavfi: Simplify non-AV stream check 
Fixes a clang warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-07 15:41:17 +02:00
James Almer
1fd880cef3 lavd/dshow: use av_codec_get_id() 
ff_codec_get_id() is a lavf internal function

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-07 13:03:17 +02:00
James Almer
0ab00a75e4 avcodec/raw: add avpriv_get_raw_pix_fmt_tags() 
Used to expose ff_raw_pix_fmt_tags[] to other libav* libraries

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-07 12:52:38 +02:00
James Almer
5b12b4fc4b lavf/mpegts: rename ff_mpegts_parse_*() to avpriv_mpegts_parse_*() 
The were wrongly being exported and used by libavdevice

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-07 04:28:11 +02:00
Thilo Borgmann
86b7821e29 lavd/avfoundation: Add device category. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-05 01:36:26 +02:00
Michael Niedermayer
39133efc1b avdevice/oss_audio: Check SNDCTL_DSP_GETFMTS failure, print a warning but continue 
Found-by: CSA and Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 21:19:15 +02:00
Anshul Maheswhwari
fcb11ec291 v4l2enc: adding AVClass 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 18:59:20 +02:00
Michael Niedermayer
1e51af13c7 avdevice/pulse_audio_enc: use getter function for AVFrame.channels 
This is required by the API/ABI for things outside libavutil

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-28 20:06:11 +02:00
Andrey Utkin
b6a6459a24 lavd/lavfi: work with non-mappable files for graph_file option 
Example of non-mappable file is /dev/stdin. Previously passing it as
graph_file value returned error.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-23 18:42:41 +02:00
Michael Niedermayer
80acedae3e Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e' 
* commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e':
  oss_audio: Split muxer and demuxer

Conflicts:
	libavdevice/Makefile
	libavdevice/oss_audio.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-19 13:39:12 +02:00
Timothy Gu
69c7aad494 oss_audio: use a macro to simplify ioctl() error checking 
Also add a note about SNDCTL_DSP_GETFMTS which may fail even if OSS is
available.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-19 03:38:31 +02:00
Nidhi Makhijani
d6e1d37100 oss_audio: Split muxer and demuxer 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-07-18 15:04:25 -07:00
Michael Niedermayer
f6ed5df9c0 Merge commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46' 
* commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46':
  avdevice: Give names to anonymously typedeffed structs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-18 21:48:37 +02:00
Diego Biurrun
c0de9159a7 avdevice: Give names to anonymously typedeffed structs 
Anonymous structs can cause trouble in header files, so try to
avoid them altogether as a matter of good style.
 2014-07-18 07:43:36 -07:00
Nicolas George
8e2976860f lavd/x11grab: reindent after last commit. 2014-07-17 18:28:58 +02:00
Nicolas George
1d12df1ad7 lavd/x11grab: add an option to disable MIT-SHM. 
With remote displays supporting the MIT-SHM extension,
the extension is detected and used, but attaching fails
asynchronously.
 2014-07-17 18:12:15 +02:00
Nicolas George
16c6795465 lavd/x11grab: check 32-bits color masks. 
The X11 servers by VNC, at 32-bits depths, has the following masks:
R:0x000007ff G:0x003ff800 B:0xffc00000
This is not compatible with AV_PIX_FMT_0RGB32, and the result
is success with completely wrong colors.
 2014-07-17 18:11:56 +02:00
Nicolas George
36fbe3c789 lavd/x11grab: change error code for unsupported visuals. 2014-07-17 18:11:55 +02:00
Nicolas George
a65c0a3fe8 lavd/x11grab: disable drawing mouse without XFixes. 
Fix a segfault if the XFixes extension is not available on
the X11 server.
Can be reproduced using the VNC server.
 2014-07-17 18:11:55 +02:00
Hanspeter Niederstrasser
04980dbee8 avdevice/avfoundation: kCVPixelFormatType_OneComponent8 only exists from 10.8 onward 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-16 00:40:32 +02:00
Michael Niedermayer
9514472904 avutil & avdevice: remove av_bprint_fd_contents() 
MSVC does not allow passing file pointers between libs
This API can thus not work with MSVC and as it was very recently added
and its it was in no release its removial should not cause any problems

A better API will be implemented, but its not finished yet, this revert is
to avoid potentially blocking the release

Found-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-15 21:49:56 +02:00
Michael Niedermayer
98eab98159 avdevice/pulse_audio_dec: reimplement using the non simple API 
This fixes timestamps

Based-on: code from pulseaudio
Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 01:36:01 +02:00
Michael Niedermayer
eee6ad38f9 avdevice/lavfi: add io.h, should fix msvc build 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 20:29:59 +02:00
Michael Niedermayer
0dbcecc8dc avdevice/oss_audio: Add #if HAVE_UNISTD_H around #include <unistd.h> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 02:48:51 +02:00
Michael Niedermayer
0ebcf87803 protect unistd.h with #if HAVE_UNISTD_H in code from recent av_bprint_fd_contents() patches 
Should fix build failure on MSVC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 01:54:30 +02:00
Andrey Utkin
2229a6dfe6 avdevice/lavfi: allow non-mmappable files for graph_file 
Use av_bprint_fd_contents() instead of av_file_map()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 21:28:25 +02:00
Michael Niedermayer
33f6ba9c4e avdevice/pulse_audio_dec: clear pa_simple pointer after deallocation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 13:05:58 +02:00
Michael Niedermayer
9efa7f82ce avdevice/xv: fix missing { 
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-30 21:32:19 +02:00
Lukasz Marek
e5c806fd67 lavd/xv: handle delete window message 
User may close X11 window by close button on tray.
FFmpeg leaves in graceless way.
This commit detects it and return EPIPE error.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-30 19:20:32 +02:00
sfan5
ffe6ecc418 lavd/avfoundation: Support user selected pixel formats and pixel format autoselection. 
Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-12 21:31:25 +02:00
Michael Niedermayer
3a10bf93b5 avdevice/lavfi: Use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-07 15:04:50 +02:00
Lou Logan
88f2586adb fix various typos 
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-03 10:58:19 -08:00
Michael Niedermayer
124c94a1c8 avdevice/v4l2: Use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-22 15:08:12 +02:00
Lukasz Marek
51bad41a13 lavd/jack_audio: use av_fifo_alloc_array 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-05-20 00:00:44 +02:00
Olivier Langlois
0a15067047 lavd: Use av_gettime_relative() 
Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.

Since v4l2 is compiled only on Linux where av_gettime_relative()
is monotonic, a small wrapper function av_gettime_monotonic() is used
(should be inlined the compiler) to put emphasis on that fact.

Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-18 16:10:12 +02:00
Michael Niedermayer
3d7218d932 Merge commit '449511740f06a4675b0066730fa45cdb764ffafc' 
* commit '449511740f06a4675b0066730fa45cdb764ffafc':
  build: handle library dependencies in configure

Conflicts:
	common.mak
	configure
	libavdevice/Makefile
	libavfilter/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-13 22:40:32 +02:00
Janne Grunau
449511740f build: handle library dependencies in configure 
Instead of setting FFLIBS in each library Makefile configure
exports FFLIBS-$library in config.mak.
 2014-05-13 20:02:01 +02:00
Lukasz Marek
75a19f5eec lavd/jack_audio: use av_fifo_freep 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-05-07 23:39:47 +02:00
Lukasz Marek
fa4f7b17bc lavd/xv: reident after previous commits 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-05-02 18:04:05 +02:00
Lukasz Marek
db4b03146c lavd/opengl_enc: fix window size correction code 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-05-02 18:04:05 +02:00
Lukasz Marek
45601854b1 lavd/opengl_enc: add window size param 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-05-02 18:03:52 +02:00
Lukasz Marek
41e4c6d8c5 lavd/opengl_enc: use flag to mark inited context 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-05-02 17:46:37 +02:00
Lukasz Marek
8ff72924cf lavd/opengl_enc: fix pixel data alignment 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 22:03:32 +02:00
Lukasz Marek
5bef4878d3 lavd/pulse_audio_enc: respect minreq while checking buffer fullness 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-30 00:36:14 +02:00