mirrors/librempeg
1
0
Fork 0
mirror of https://github.com/librempeg/librempeg synced 2024-11-23 11:39:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,969 Commits 35 Branches 387 Tags 188 MiB
6ca9c74cc6
Commit Graph

2438 Commits

Author SHA1 Message Date
Michael Niedermayer
494945cb66 Merge commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480' 
* commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480':
  avcodec: split avpicture from imgconvert
  pixdesc: add PIX_FMT_ALPHA flag

Conflicts:
	libavcodec/imgconvert.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-21 15:37:01 +01:00
Michael Niedermayer
c44a028e19 af_aresample: allocate at least 1 sample buffer. Fix null ptr dereference. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 15:55:54 +01:00
Michael Niedermayer
27d39c225b liavfi/avcodec: allow channel layouts with fewer channels than actually available. 
This fixes the regression with Ticket1726, where some audio was lost.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 22:54:18 +01:00
Stefano Sabatini
158763312f lavfi/frei0r: in init() check path loop, free resources in a single point 2012-11-18 16:52:46 +01:00
Stefano Sabatini
6c7ae49330 lavfi/frei0r: extend load_path() to support arbitrarily long paths 2012-11-18 16:52:46 +01:00
Clément Bœsch
f6be711a69 lavfi/mp/pp: use PP_CPU_CAPS_AUTO. 2012-11-18 16:21:59 +01:00
Nicolas George
c437c251b8 lavfi/drawtext: implement more generic expansion. 
The new expansion mechanism uses the %{...} notation.
For compatibility reasons, it must be enabled explicitly,
but a warning is printed if a conflict is likely to happen.
 2012-11-18 15:55:47 +01:00
Nicolas George
29e388abcb lavfi/drawtext: use bprint for the expanded text. 2012-11-17 19:47:56 +01:00
Clément Bœsch
b3bf9b1d97 lavfi/geq: fix GPL license header. 
100l: original code is GPL, header miscopied. LICENSE file and configure
dependency are fine.
 2012-11-15 21:48:39 +01:00
Stefano Sabatini
334a0d15c6 lavfi/frei0r: add additional trailing slash in FREI0R_PATH paths 
Allow to accept paths with no ending trailing slash.

Based on a patch by rogerdpack <rogerpack2005@gmail.com>.
 2012-11-13 22:54:29 +01:00
Stefano Sabatini
9a2028d4f4 lavfi/frei0r: correctly handle paths longer than 1023 chars 2012-11-13 22:41:01 +01:00
Paul B Mahol
1acd2f6ba7 Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h 
Also remove it in once case when it is not needed.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-13 13:21:21 +00:00
Stefano Sabatini
7945665200 lavfi: store and propagate number of channels information in audio buffer properties 
The channels field is required since the channel layout is not always
available.
 2012-11-13 12:15:27 +01:00
Michael Niedermayer
03b078721c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
  doc: git-howto: Leave reviewers time to react before pushing patches
  Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
  lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h

Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	doc/git-howto.texi
	ffmpeg_filter.c
	libavcodec/flacdec.c
	libavcodec/imc.c
	libavcodec/mpegaudiodec.c
	libavcodec/utils.c
	libavfilter/asrc_anullsrc.c
	libavfilter/audio.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.c
	libavfilter/buffer.c
	libavutil/Makefile
	libavutil/audioconvert.h
	libavutil/channel_layout.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-12 11:32:11 +01:00
Clément Bœsch
3a7f00810c lavfi: remove mp=geq filter. 
Native geq video filter is now available.
 2012-11-11 23:18:12 +01:00
Clément Bœsch
8eecbaf5e4 lavfi: add geq filter. 2012-11-11 23:12:54 +01:00
Clément Bœsch
2b3597f0d1 lavfi: remove mp=fixpts filter. 
lavfi/f_setpts.c should allow everything mp=fixpts supports, with a lot
of additional control.
 2012-11-11 22:49:53 +01:00
Clément Bœsch
84aed3faf0 lavfi: remove mp=tile filter. 
The native tile video filter is now feature equivalent.
 2012-11-11 22:43:18 +01:00
Clément Bœsch
7582012058 lavfi/tile: extend shorthand parameters. 
This makes the syntax similar to mp=tile.
 2012-11-11 22:43:18 +01:00
Clément Bœsch
4a90e7124d lavfi/tile: add nb_frames option. 2012-11-11 22:43:18 +01:00
Clément Bœsch
ecfaff350f lavfi/tile: add margin and padding options. 2012-11-11 22:43:17 +01:00
Clément Bœsch
aa5a029091 lavfi/tile: allow named arguments. 2012-11-11 22:43:17 +01:00
Justin Ruggles
a903f8f087 Include libavutil/channel_layout.h instead of libavutil/audioconvert.h 
Also reorder some other #include when applicable.
 2012-11-11 13:35:12 -05:00
Michael Niedermayer
47ca2487ae lavfi/avcodec: check that injected avframes use a supported channel layout 
This fixes out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-10 21:45:34 +01:00
Michael Niedermayer
a150bad406 lavfi/avcodec: check avfilter_copy_frame_props() return code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-10 21:37:40 +01:00
Stefano Sabatini
2b442ff5f5 lavfi/movie: return proper error code in case of av_get_token() allocation failure 
Also slightly clarify logic, and should fix coverity issue CID 717771.
 2012-11-06 23:31:16 +01:00
Stefano Sabatini
b5436f4b5d lavfi/showwaves: return error in case of allocation failure in filter_samples() 2012-11-06 22:48:54 +01:00
Stefano Sabatini
5f634480d1 lavfi/showwaves: simplify check in filter_samples() 
Also fix Coverity issue CID 733743: Dereference after null check
 2012-11-06 22:48:17 +01:00
Michael Niedermayer
44e9d7f182 vf_drawbox: dont move uninitialized and then unused colors around 
Fixes CID741419
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 21:40:23 +01:00
Paul B Mahol
e870a7dd4a lavfi: stop using -1 instead use AV_PIX_FMT_NONE/AV_SAMPLE_FMT_NONE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-05 13:34:08 +00:00
Stefano Sabatini
1ba2459fbb lavfi/scale: declare the filter private class 
Allow to show the supported options in the ffmpeg -h full output.
 2012-11-04 18:01:16 +01:00
Michael Niedermayer
4a2599b0e6 transform: give avfilter_transform() a return value for returning an error 
Fixes CID703674
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-04 01:30:16 +01:00
Stefano Sabatini
d034847f7a lavfi/earwax: add missing NULL check in filter_samples() 2012-11-04 00:17:27 +01:00
Michael Niedermayer
37e81996dc Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f' 
* commit '9221efef7968463f3e3d9ce79ea72eaca082e73f':
  lavf: fix av_interleaved_write_frame() doxy.
  lavf: clarify the lifetime of demuxed packets.
  avconv: do not free muxed packet on streamcopy.
  crc: move doxy to the header
  vf_drawtext: do not use deprecated av_tree_node_size
  x86: Refactor PSWAPD fallback implementations and port to cpuflags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 14:24:11 +01:00
Michael Niedermayer
ac2a3a7a05 vf_tinterlace: check av_image_get_linesize() return value 
Fixes CID703717
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 02:38:30 +01:00
Michael Niedermayer
03764f6735 af_earwax: remove unused pointer value 
Fixes CID703849
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 02:38:23 +01:00
Anton Khirnov
b68aac7ea3 vf_drawtext: do not use deprecated av_tree_node_size 2012-11-02 18:28:55 +01:00
Michael Niedermayer
4695ee71b0 lavfi/fifo: add assert to ensure request was successfull. 
We would crash a moment later anyway if this fails.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-01 18:02:23 +01:00
Michael Niedermayer
add7513e64 Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415' 
* commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415':
  x86: h264_chromamc_10bit: drop pointless PAVG %define
  x86: mmx2 ---> mmxext in function names
  swscale: do not forget to swap data in formats with different endianness

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavfilter/x86/gradfun.c
	libswscale/input.c
	libswscale/utils.c
	libswscale/x86/swscale.c
	tests/ref/lavfi/pixfmts_scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-01 13:11:51 +01:00
Clément Bœsch
54a48d2f04 lavfi: fix references to avfilter_* functions that don't exist anymore. 2012-10-31 20:54:59 +01:00
Clément Bœsch
f53112b665 lavfi: remove hqdn3d libmpcodecs wrapper. 
The native filter was ported from the MPlayer project when the mp
wrapper didn't even exist, and when mp=hqdn3d was added, it was already
obsolete.
 2012-10-31 19:28:02 +01:00
Diego Biurrun
d8eda37080 x86: mmx2 ---> mmxext in function names 2012-10-31 17:53:57 +01:00
Stefano Sabatini
1b21642149 lavfi/scale: avoid to print a NULL value in log message 
Fix possible crash occurring when libc does not support NULL printing.
 2012-10-31 15:46:46 +01:00
Stefano Sabatini
29a9e4d5c9 lavfi/mp: drop the mp=rectangle filter 
All the rectangle features have been ported to the native drawbox filter,
which has an equivalent syntax.
 2012-10-31 14:46:18 +01:00
Stefano Sabatini
9d478f38cd lavfi/drawbox: add "width" and "height" aliases for "w" and "h" options 2012-10-31 14:43:47 +01:00
Stefano Sabatini
93399e9381 lavfi/drawbox: add thickness option 2012-10-31 14:43:47 +01:00
Michael Niedermayer
9766d9c985 Merge commit '04581c8c77ce779e4e70684ac45302972766be0f' 
* commit '04581c8c77ce779e4e70684ac45302972766be0f':
  x86: yasm: Use complete source path for macro helper %includes

Conflicts:
	Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-31 13:57:09 +01:00
Michael Niedermayer
3174616f59 Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 
* commit '6860b4081d046558c44b1b42f22022ea341a2a73':
  x86: include x86inc.asm in x86util.asm
  cng: Reindent some incorrectly indented lines
  cngdec: Allow flushing the decoder
  cngdec: Make the dbov variable have the right unit
  cngdec: Fix the memset size to cover the full array
  cngdec: Update the LPC coefficients after averaging the reflection coefficients
  configure: fix print_config() with broke awks

Conflicts:
	libavcodec/x86/ac3dsp.asm
	libavcodec/x86/dct32.asm
	libavcodec/x86/deinterlace.asm
	libavcodec/x86/dsputil.asm
	libavcodec/x86/dsputilenc.asm
	libavcodec/x86/fft.asm
	libavcodec/x86/fmtconvert.asm
	libavcodec/x86/h264_chromamc.asm
	libavcodec/x86/h264_deblock.asm
	libavcodec/x86/h264_deblock_10bit.asm
	libavcodec/x86/h264_idct.asm
	libavcodec/x86/h264_idct_10bit.asm
	libavcodec/x86/h264_intrapred.asm
	libavcodec/x86/h264_intrapred_10bit.asm
	libavcodec/x86/h264_weight.asm
	libavcodec/x86/vc1dsp.asm
	libavcodec/x86/vp3dsp.asm
	libavcodec/x86/vp56dsp.asm
	libavcodec/x86/vp8dsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-31 13:43:33 +01:00
Stefano Sabatini
755038d07d lavfi/drawbox: remove some unnecessary parentheses 2012-10-31 12:20:50 +01:00
Stefano Sabatini
003bd88d99 lavfi/drawbox: reindent after previous commit 2012-10-31 12:14:21 +01:00