generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
62,337 Commits 24 Branches 241 Tags 173 MiB
517cc81e93
Commit Graph

62337 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
517cc81e93 ffmpeg: stop protocols on interrupt when no transcoding has happened yet 
Fixes Ticket3344

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-10 22:29:23 +02:00
Carl Eugen Hoyos
ecb80fe78c Cosmetics: Remove an outdated comment from lavc/rawdec.c. 
The missing swscale feature was implemented in 2011.
 2014-04-10 22:25:39 +02:00
Michael Niedermayer
6290ba0052 avfilter/settb: remove duplicate #include 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-10 21:58:03 +02:00
James Almer
09c1654208 lavf/rtspcodes: add missing header include 
Fixes make checkheaders

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-10 21:57:04 +02:00
Michael Niedermayer
a4662cd6b1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libx265: Only set the SAR if it is valid
  libx265: Use 16-bit SAR
  libx265: Use x265_param_parse to set the SAR

See: 8945dcbb52
See: fcc43e02d3
See: cdd21f1f03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-10 21:34:08 +02:00
Michael Niedermayer
4d4bc89409 avformat/mov: merge mov_read_custom_metadata() and mov_read_custom() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-10 21:25:51 +02:00
Michael Niedermayer
6e573b7759 Merge commit '9a07fac678a8540d076e635061bbaa4ed09a9431' 
* commit '9a07fac678a8540d076e635061bbaa4ed09a9431':
  mov: read hydrogenaudio replaygain information

Conflicts:
	libavformat/Makefile
	libavformat/mov.c

See: 37a15f3e66
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-10 21:25:15 +02:00
Michael Niedermayer
c486cfab79 avcodec/imgconvert: fix nb_components and depth for PAL8 in get_pix_fmt_score() 
This causes us to favor RGB8 over PAL8 when FF_LOSS_COLORQUANT is used

It probably makes sense to reinvestigate the exact scoring of pal8 when
our pal8 support improves to be supperior to rgb8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-10 19:58:14 +02:00
Derek Buitenhuis
cdd21f1f03 libx265: Only set the SAR if it is valid 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-10 16:49:03 +01:00
Derek Buitenhuis
fcc43e02d3 libx265: Use 16-bit SAR 
The spec says it is 16 bits.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-10 16:49:03 +01:00
Matt Oliver
d1e6e5c887 avcodec/x86: Exclude broken get_cabac under icl. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-10 17:47:22 +02:00
Michael Niedermayer
4764714952 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libavfilter: Add asettb filter for setting timebase for audio

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/settb.c
	libavfilter/version.h

See: ba856c0be5 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-10 15:08:04 +02:00
Derek Buitenhuis
25fbfeed98 libx265: Only set the SAR if it is valid 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-10 13:28:59 +01:00
Derek Buitenhuis
cd0ac6f6e5 libx265: Use 16-bit SAR 
The spec says it is 16 bits.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-10 13:28:55 +01:00
Derek Buitenhuis
8945dcbb52 libx265: Use x265_param_parse to set the SAR 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-10 13:08:01 +01:00
Derek Buitenhuis
4a2226451e libx265: Use x265_param_parse to set the SAR 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-04-10 13:06:45 +01:00
Anton Khirnov
9a07fac678 mov: read hydrogenaudio replaygain information 2014-04-10 13:53:32 +02:00
Nicolas George
ad8159e0fe libavfilter: Add asettb filter for setting timebase for audio 
Ported asettb (including the sr option for audio sample rate) from FFmpeg,
and copied/modified the existing settb documentation for asettb.

Signed-off-by: Katerina Barone-Adesi <katerinab+libav@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-04-10 12:52:19 +02:00
Lukasz Marek
e1c48e3593 lavf/utils: fix mem leak 
Calling avformat_free_context() right after avformat_alloc_output_context2()
leaved option's default values not freed.
Options were freed only in av_write_trailer().

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-10 03:24:07 +02:00
Lukasz Marek
fbf05759e3 sws: fix warning about RGB_PACK24_B_OPERANDS redefinition 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-10 02:07:07 +02:00
Michael Niedermayer
421c116fc4 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Fix a typo in amr.c.
  Remove an unneeded include of avassert.h from amr.c.
  Do not allow writing invalid wav channel layouts by default.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-10 00:33:57 +02:00
Michael Niedermayer
849d40dce6 avcodec/mpegvideo_enc: change some asserts to av_asserts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 23:57:18 +02:00
Michael Niedermayer
968516cebf avformat/nut: add ff_nut_audio_extra_tags to demuxer too 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 23:37:55 +02:00
Carl Eugen Hoyos
cf79f20275 Fix a typo in amr.c. 2014-04-09 23:21:38 +02:00
Carl Eugen Hoyos
2a3ff9fbba Remove an unneeded include of avassert.h from amr.c. 2014-04-09 23:21:38 +02:00
Carl Eugen Hoyos
bf87d582b1 Do not allow writing invalid wav channel layouts by default. 
Neither WMP nor QT play wav files with too large channel layouts.
Fixes ticket #3543.
 2014-04-09 23:21:38 +02:00
Michael Niedermayer
f703dae7aa avcodec/cngdec: use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 23:18:32 +02:00
Michael Niedermayer
2773ab36cc avcodec/jpeglsdec/ff_jpegls_decode_lse: check len field validity 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 23:12:44 +02:00
Michael Niedermayer
020600eed1 avcodec/jpeglsdec: ask for sample for "oversized image" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 23:12:44 +02:00
Michael Niedermayer
375013e3d6 avcodec/mpeg12dec: drop confusing av_dlog() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 23:12:44 +02:00
Anthoine Bourgeois
d8ab7f31dd avcodec/dirac_arith: Fix build with PIC and stack-check options 
Fixes Ticket3540

The function dirac_get_arith_bit in libavcodec/dirac_arith.h can't be
built with PIC and check-stack because the asm code needs 6 registers
and PIC and check-stack options take 1 each and x86 is quite limited
in this area.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 19:41:48 +02:00
Michael Niedermayer
7ac2f7e413 avutil/log: factor "level != AV_LOG_INFO/8" checks out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 16:30:16 +02:00
Michael Niedermayer
dddacf780f avcodec/sanm: use named consant instead of literal number 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 16:23:57 +02:00
Michael Niedermayer
acf112ba6e avcodec/mpegvideo: remove AVFrame padding, as the hack isnt needed anymore 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 16:17:22 +02:00
Michael Niedermayer
2ca553ed9c avcodec/snowenc: remove operations that have become redundant with AVFrame pointers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 16:17:22 +02:00
Michael Niedermayer
59a53842d3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpegvideo: operate with pointers to AVFrames instead of whole structs

Conflicts:
	libavcodec/h261dec.c
	libavcodec/h263dec.c
	libavcodec/intrax8.c
	libavcodec/mpeg12enc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_motion.c
	libavcodec/mpegvideo_xvmc.c
	libavcodec/msmpeg4.c
	libavcodec/ratecontrol.c
	libavcodec/vaapi.c
	libavcodec/vc1dec.c
	libavcodec/vdpau_vc1.c

See: fc567ac49e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 15:18:46 +02:00
Michael Niedermayer
60ef0c6f90 Merge commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf' 
* commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf':
  fate: correctly set sample rate for mp2 tests

Conflicts:
	tests/fate/acodec.mak
	tests/lavf-regression.sh

one hunk has been ommited as it breaks fate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 13:58:55 +02:00
Thilo Borgmann
c740e083bc configure: Fail on missing prototypes in check_oc. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 13:30:40 +02:00
Michael Niedermayer
44841528c1 avcodec/mpegaudioenc_template: reorder operations to prevent integer overflow 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 07:04:12 +02:00
Michael Niedermayer
9d66aa2c8f avcodec/mpegaudioenc_template: dont crash on bitrate=0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 05:16:52 +02:00
Michael Niedermayer
d98688efb1 swscale/input: replace assert() by av_assert1() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 05:14:34 +02:00
Michael Niedermayer
624327988f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc: Completely document the x264 options

Conflicts:
	doc/encoders.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 04:54:26 +02:00
Michael Niedermayer
43935842bd Merge commit '0d671ade99059fd47b155df85c10c35eb6d54878' 
* commit '0d671ade99059fd47b155df85c10c35eb6d54878':
  doc: Use a 3 columns multitable

Conflicts:
	doc/encoders.texi

No change as we dont use a multitable for this list
we could of course switch to one though if it looks better
comments welcome

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 04:49:15 +02:00
Michael Niedermayer
8f23045b16 Merge commit 'be59675add2a05a7400b1abf86201ab069d7b1dd' 
* commit 'be59675add2a05a7400b1abf86201ab069d7b1dd':
  doc: Change the multitable rendering in texi2pod

Conflicts:
	doc/texi2pod.pl

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 04:26:20 +02:00
Michael Niedermayer
e40d92b1e4 Merge commit '59388dac69f9a79eddb003d1c6aad5ec89d4287b' 
* commit '59388dac69f9a79eddb003d1c6aad5ec89d4287b':
  fate: update tests for YVYU422 pixel format

Conflicts:
	tests/ref/fate/filter-pixdesc
	tests/ref/fate/filter-pixfmts-copy
	tests/ref/fate/filter-pixfmts-null
	tests/ref/fate/filter-pixfmts-scale
	tests/ref/fate/filter-pixfmts-vflip

No change as the fate tests where updated in the merges that changed
the scores

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 04:16:35 +02:00
Michael Niedermayer
233dbee3bc Merge commit 'b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a' 
* commit 'b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a':
  rawvideo: Support decoding YVYU422 FourCC

See: ab7d6cb8f7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 04:06:35 +02:00
Michael Niedermayer
ed962414bd Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3' 
* commit '92b099daf4b8ef93513e38b43899cb8458a2fde3':
  swscale: support converting YVYU422 pixel format

Conflicts:
	libswscale/input.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 03:36:38 +02:00
Michael Niedermayer
0a1cc04e6c Merge commit '8b17243d1742279bcb2368f8d325ea71e66736c8' 
* commit '8b17243d1742279bcb2368f8d325ea71e66736c8':
  lavu: Add packed YVYU422 pixel format

Conflicts:
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 03:07:47 +02:00
Michael Niedermayer
352e13e2a9 Merge commit '46439e156219d27f059cf687743ba5aacf238b87' 
* commit '46439e156219d27f059cf687743ba5aacf238b87':
  mp2: match twolame default options

Not merged as the change breaks fate, also forcing resampling to specific sample rate
reduces quality, and would be like rescaling every movie to 1080.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 02:59:43 +02:00
Michael Niedermayer
6c019f05ed Merge commit '718907cd881a0b593264aed059c0e00da13f9e15' 
* commit '718907cd881a0b593264aed059c0e00da13f9e15':
  libtwolame MP2 encoding support

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/Makefile
	libavcodec/libtwolame.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 02:17:56 +02:00