generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
71,744 Commits 24 Branches 241 Tags 173 MiB
5bebd13d2d
Commit Graph

71744 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
81487781e7 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  lavc/h264_refs: Fix compilation with -DTRACE.
  Fix make checkheaders if libmfx is not available.
  lavf/gif: Add an option max_gif_delay to limit the frame duration.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-29 13:19:50 +02:00
Michael Niedermayer
93704e09c7 Merge commit '72025ac36c740f031d7e413041fdfe97087c83c4' 
* commit '72025ac36c740f031d7e413041fdfe97087c83c4':
  lavc: add libdcadec decoder

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/libdcadec.c

See: 519868de7d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-29 13:01:26 +02:00
Carl Eugen Hoyos
b3673f3414 lavc/h264_refs: Fix compilation with -DTRACE. 2015-03-29 12:34:43 +02:00
Carl Eugen Hoyos
d371471c59 Fix make checkheaders if libmfx is not available. 2015-03-29 12:34:13 +02:00
Carl Eugen Hoyos
7de0fefeb5 lavf/gif: Add an option max_gif_delay to limit the frame duration. 
Allows playback for the sample from ticket #4369 in less than 18 hours.
 2015-03-29 12:31:00 +02:00
Michael Niedermayer
97a407f696 Merge commit '6fe2641d6e410b7bc203138fa97e1118b411f16d' 
* commit '6fe2641d6e410b7bc203138fa97e1118b411f16d':
  lavc: add profile define for DTS Express

Conflicts:
	doc/APIchanges
	libavcodec/version.h

See: 11fe56c8bb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-29 12:24:33 +02:00
Michael Niedermayer
268ff17cb7 Merge commit 'c48456166e95648719a8be8f8613f9dee98205c1' 
* commit 'c48456166e95648719a8be8f8613f9dee98205c1':
  lavc: add MMAL hardware decoder wrapper

Conflicts:
	Changelog
	configure
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/version.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-29 11:32:24 +02:00
Hendrik Leppkes
72025ac36c lavc: add libdcadec decoder 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-03-29 10:15:09 +02:00
Hendrik Leppkes
6fe2641d6e lavc: add profile define for DTS Express 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-03-29 10:00:38 +02:00
wm4
c48456166e lavc: add MMAL hardware decoder wrapper 
Based on a patch by Rodger Combs.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-03-29 09:55:20 +02:00
Matthieu Bouron
cf16b459a8 libavdevice/avfoundation: use pts/dts provided by the CMSampleBuffer API 
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-29 04:08:33 +02:00
Matthieu Bouron
021b023751 libavdevice/avfoundation: add capture_mouse_clicks option 
Support mouse clicks capture while recording a screen on OSX >= 10.7.

Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-29 04:07:43 +02:00
Matthieu Bouron
c908cae74c libavdevice/avfoundation: add capture_cursor option 
Add support for cursor capturing while recording a screen for OSX >=
10.8.

Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-29 03:50:31 +02:00
Matthieu Bouron
573a77a1b6 libavdevice/avfoundation: add framerate and video size options 
Support framerate ands video size options on AVCaptureDevices for
OSX >= 10.7 and iOS >= 7.0.

For screen captures, only the framerate option is taken into account.

Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-29 03:49:38 +02:00
Michael Niedermayer
6a3833e141 ffmpeg_opt: Do not overwrite output if there is no input 
Fixes Ticket4254

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 23:00:07 +01:00
Carl Eugen Hoyos
dcac15a84c lavc/dnxhd: Fix pix_fmt change. 
Fixes ticket #4400.
 2015-03-28 17:36:02 +01:00
Donny Yang
fe57514f8a png: Minor whitespace change and added missing comment 
Signed-off-by: Donny Yang <work@kota.moe>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 17:16:55 +01:00
Donny Yang
5904d039ce png: Use av_freep() instead of av_free() 
Signed-off-by: Donny Yang <work@kota.moe>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 17:16:55 +01:00
Michael Niedermayer
68bcc64f74 fate/filter-video: Use qp filter to generate non constant qp array for more throughout testing of the pp filter 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 15:29:56 +01:00
Michael Niedermayer
2856634c67 vfilter/vf_qp: Support evaluating expression per MB 
also add support for x/y/w/h parameters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 15:18:58 +01:00
Michael Niedermayer
a8fb8f6112 avfilter/vf_qp: split expression parsing out of loop 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 15:17:36 +01:00
Marton Balint
625bd463cd af_channelmap: fix number of channels 
Fixes segfaults with the following command:

ffmpeg -f lavfi -i aevalsrc=0:c=stereo:n=1920 -af 'channelmap=0' test.ac3

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 11:16:26 +01:00
Michael Niedermayer
048b6331e0 avcodec/qsv_internal: Fix project name 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 03:44:19 +01:00
Lukasz Marek
56b7aa2138 doc/examples: add directory listing example 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 03:13:44 +01:00
Tucker DiNapoli
303c3dada2 postproc: Removed unecessary if/else branch when getting QP. 
There's still an if, as QP needs to be modified if isColor=0, but it
still removes a unecessary branch.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 01:49:12 +01:00
Michael Niedermayer
0a731e4596 Merge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2' 
* commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2':
  lavc: add Intel libmfx-based H.264 encoder

Conflicts:
	Changelog
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 01:33:27 +01:00
Michael Niedermayer
d985976e54 Merge commit '9ba27c2348d26000257e891e40a72facb0d916be' 
* commit '9ba27c2348d26000257e891e40a72facb0d916be':
  qsvdec: add 'decode' to the non-static function names

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 01:25:20 +01:00
Michael Niedermayer
b12eacb383 Merge commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791' 
* commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791':
  qsvdec: split off some code that will be shared with the encoder

Conflicts:
	libavcodec/Makefile
	libavcodec/qsvdec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 01:16:21 +01:00
Michael Niedermayer
151ae8ea5b Merge commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1' 
* commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1':
  qsv: rename to qsvdec

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 01:03:23 +01:00
Michael Niedermayer
4ae7c37099 fate: Use a variable QP input for fate-filter-pp 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 00:43:31 +01:00
Michael Niedermayer
c664989803 fate: simplify filter-pp tests 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-28 00:26:12 +01:00
Anton Khirnov
72b7441a10 lavc: add Intel libmfx-based H.264 encoder 2015-03-27 22:02:10 +01:00
Anton Khirnov
9ba27c2348 qsvdec: add 'decode' to the non-static function names 2015-03-27 21:57:47 +01:00
Anton Khirnov
d0a63d8b98 qsvdec: split off some code that will be shared with the encoder 2015-03-27 21:57:28 +01:00
Anton Khirnov
b04d009b0e qsv: rename to qsvdec 
This is to avoid conflicts with the upcoming QSV encoding support.
 2015-03-27 21:56:36 +01:00
Michael Niedermayer
d03b998c48 avformat/avio: Document the end of list case in avio_read_dir() 
This was mentioned in a previous review

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-27 21:34:23 +01:00
Himangi Saraogi
fff7871772 lavfi: add inverse telecine filter 
Approved-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-27 21:34:03 +01:00
Lukasz Marek
184084c699 lavf: add directory listing API 
API allows protocol implementations to provide API that
allows to list directory content.
API is similar to POSIX opendir/readdir/closedir.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-27 18:29:46 +01:00
Himangi Saraogi
dbce8cdacf avfilter/vf_telecine: Avoid floating point values 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-27 15:52:59 +01:00
Michael Niedermayer
174330b18e avutil/timer: give each printed value of STOP_TIMER a fixed length 
this makes the result easier to read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-27 04:44:58 +01:00
Michael Niedermayer
0fee509cf5 avutil/timer: show histogram of cpu cycles each run took 
The new information is printed at verbose log level and can thus be switched on and off
through the log level

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-27 04:20:13 +01:00
James Almer
1f5d1eed78 avutil/cpu: add missing check for mmxext to av_force_cpu_flags 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-03-26 22:54:15 -03:00
Himangi Saraogi
613483dcfb avfilter/vf_telecine: Fix loss of AVFrame properties in output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-27 02:12:10 +01:00
Michael Niedermayer
0245abc7c1 avcodec/x86/hpeldsp_init: Put CONFIG_* first in if() 
This is more consistent and may fix a build failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-26 15:41:27 +01:00
Michael Niedermayer
cd5a48e549 avcodec/h264_slice: Put CONFIG_GRAY first in if() 
This is more consistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-26 15:41:27 +01:00
Michael Niedermayer
47aee6f047 avcodec/arm/flacdsp_init_arm: Put CONFIG_FLAC_DECODER first in if() 
This is more consistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-26 15:41:27 +01:00
Michael Niedermayer
71258e5d87 avcodec/ac3dec: Put CONFIG* first in if() 
This may fix build failures with EAC3 disabled and is more consistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-26 15:41:27 +01:00
Michael Niedermayer
2139e58439 avformat/dv: fix used dimension variables 
Fixes null pointer dereference during seeking
Fixes Ticket4395

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-26 03:10:27 +01:00
Michael Niedermayer
df43d03731 avformat/rmdec: fix support for 0 sized mdpr 
Fixes Ticket4393

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-26 02:02:18 +01:00
Himangi Saraogi
1301aa55f6 avfilter/vf_telecine: Fix AV desync by using the first input timestamp 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-26 00:41:54 +01:00