ffmpeg.git
7 years agoLICENSE: add libutvideo in the GPL libraries list.
Clément Bœsch [Fri, 29 Mar 2013 01:08:16 +0000 (02:08 +0100)]
LICENSE: add libutvideo in the GPL libraries list.

7 years agogmc: Always use edge emu
Michael Niedermayer [Thu, 28 Mar 2013 21:23:27 +0000 (22:23 +0100)]
gmc: Always use edge emu

The gmc functions access more pixels than there is allocated memory.
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowmv2: drop non emu edge mode
Michael Niedermayer [Thu, 28 Mar 2013 20:56:02 +0000 (21:56 +0100)]
wmv2: drop non emu edge mode

slightly (~ 0.5%) faster, tested with time ./ffmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowmv2: Use emu edge mode when the edge is too small
Michael Niedermayer [Thu, 28 Mar 2013 20:49:45 +0000 (21:49 +0100)]
wmv2: Use emu edge mode when the edge is too small

Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264_refs: Check for attempts to assign pictures to short & long.
Michael Niedermayer [Thu, 28 Mar 2013 20:09:01 +0000 (21:09 +0100)]
h264_refs: Check for attempts to assign pictures to short & long.

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate/filter: make overlay test bitexact.
Clément Bœsch [Thu, 28 Mar 2013 16:55:02 +0000 (17:55 +0100)]
fate/filter: make overlay test bitexact.

7 years agofate/filter: move gradfun filtergraph to a dedicated script.
Clément Bœsch [Thu, 28 Mar 2013 16:35:43 +0000 (17:35 +0100)]
fate/filter: move gradfun filtergraph to a dedicated script.

7 years agofate/filter: move concat filtergraph to a dedicated script.
Clément Bœsch [Thu, 28 Mar 2013 16:30:46 +0000 (17:30 +0100)]
fate/filter: move concat filtergraph to a dedicated script.

7 years agofate/filter: move some CMD below deps for consistency.
Clément Bœsch [Thu, 28 Mar 2013 16:26:30 +0000 (17:26 +0100)]
fate/filter: move some CMD below deps for consistency.

7 years agofate/filter: remove pointless indirections for gradfun and hqdn3d.
Clément Bœsch [Thu, 28 Mar 2013 16:25:59 +0000 (17:25 +0100)]
fate/filter: remove pointless indirections for gradfun and hqdn3d.

7 years agofate/filter: rename 'ubitux' rules to 'sample'.
Clément Bœsch [Thu, 28 Mar 2013 16:23:18 +0000 (17:23 +0100)]
fate/filter: rename 'ubitux' rules to 'sample'.

7 years agofate/filter: stick delogo test with its deps (cosmetics).
Clément Bœsch [Thu, 28 Mar 2013 16:20:18 +0000 (17:20 +0100)]
fate/filter: stick delogo test with its deps (cosmetics).

7 years agoavidec: Fix demuxing of non seekable avis with multiple RIFFs
Michael Niedermayer [Thu, 28 Mar 2013 16:22:35 +0000 (17:22 +0100)]
avidec: Fix demuxing of non seekable avis with multiple RIFFs

This solution uses the size of the first RIFF if its valid
to check frame size validity when the filesize could not be determined.
Feedback is welcome, other ideas and improvments as well!

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavd/v4l2: fix printing of list_formats table
Giorgio Vazzana [Thu, 28 Mar 2013 13:05:53 +0000 (14:05 +0100)]
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>
7 years agolavd/v4l2: replace ioctl() with v4l2_ioctl()
Giorgio Vazzana [Thu, 28 Mar 2013 12:03:02 +0000 (13:03 +0100)]
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>
7 years agofate: Disable af_join test, as its output is not deterministic currently
Michael Niedermayer [Thu, 28 Mar 2013 14:29:21 +0000 (15:29 +0100)]
fate: Disable af_join test, as its output is not deterministic currently

The reason for the failure is unknown, this needs to be debuged and fixed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaf_join: fix channel count and format
Michael Niedermayer [Thu, 28 Mar 2013 14:12:47 +0000 (15:12 +0100)]
af_join: fix channel count and format

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 28 Mar 2013 14:02:49 +0000 (15:02 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vmdav: convert to bytestream2
  FATE: add a test for the join filter
  FATE: add a test for the volume filter

Conflicts:
libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaf_channelsplit: set output channels, fix assertion failure
Michael Niedermayer [Thu, 28 Mar 2013 13:22:05 +0000 (14:22 +0100)]
af_channelsplit: set output channels, fix assertion failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '43a8333a16c796b3d855fb3aaa742103cb62731f'
Michael Niedermayer [Thu, 28 Mar 2013 13:10:20 +0000 (14:10 +0100)]
Merge commit '43a8333a16c796b3d855fb3aaa742103cb62731f'

* commit '43a8333a16c796b3d855fb3aaa742103cb62731f':
  FATE: add a test for the channelsplit filter
  FATE: add a test for the channelmap filter
  FATE: add a test for the negate filter
  FATE: add a test for the overlay filter

Conflicts:
tests/fate/filter.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ea290d919a52f0f8c7e30d69328bb011ed13f61a'
Michael Niedermayer [Thu, 28 Mar 2013 13:00:15 +0000 (14:00 +0100)]
Merge commit 'ea290d919a52f0f8c7e30d69328bb011ed13f61a'

* commit 'ea290d919a52f0f8c7e30d69328bb011ed13f61a':
  FATE: add a test for the setpts filter
  FATE: add a test for the hqdn3d filter
  FATE: add a test for the transpose filter
  FATE: add a test for the unsharp filter

Conflicts:
tests/ref/fate/filter-hqdn3d

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1a6d4bd7b60761bd7d955011ce7df4dd6b87b497'
Michael Niedermayer [Thu, 28 Mar 2013 12:23:12 +0000 (13:23 +0100)]
Merge commit '1a6d4bd7b60761bd7d955011ce7df4dd6b87b497'

* commit '1a6d4bd7b60761bd7d955011ce7df4dd6b87b497':
  FATE: add a test for the fade filter
  FATE: add a test for the drawbox filter
  FATE: add a test for the boxblur filter
  FATE: add a test for the gradfun filter

Conflicts:
tests/fate/filter.mak
tests/ref/fate/filter-gradfun

our gradfun test is renamed to gradfun-ubitux as its name conflicts and
it was requested to be kept. Feel free to rename, change, finetune ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'
Michael Niedermayer [Thu, 28 Mar 2013 12:00:39 +0000 (13:00 +0100)]
Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'

* commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c':
  lavfi/gradfun: remove rounding to match C and SSE code.
  lavfi/gradfun: fix dithering in MMX code.
  lavfi/gradfun: fix rounding in MMX code.
  lavfi/gradfun: do not increment DC pointer for odd values.
  fate: filter: Add dependencies
  avconv: add options for reading filtergraphs from a file.

Conflicts:
Changelog
doc/ffmpeg.texi
doc/filters.texi
ffmpeg.h
ffmpeg_opt.c
libavfilter/vf_gradfun.c
tests/fate/filter.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/biquads: fix min allowed option value
Paul B Mahol [Thu, 28 Mar 2013 11:52:11 +0000 (11:52 +0000)]
lavfi/biquads: fix min allowed option value

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge commit 'cf53704c55378cc0dcfc16637cdac7d58f0b3107'
Michael Niedermayer [Thu, 28 Mar 2013 11:26:36 +0000 (12:26 +0100)]
Merge commit 'cf53704c55378cc0dcfc16637cdac7d58f0b3107'

* commit 'cf53704c55378cc0dcfc16637cdac7d58f0b3107':
  AVOptions: make av_set_options_string() forward options to child objects
  win32: Use 64-bit fstat/lseek variants for MSVC as well
  win32: Make ff_win32_open more robust

Conflicts:
libavformat/os_support.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'e9cc98839574c7e8d546e890ebbf57d1766e5d8a'
Michael Niedermayer [Thu, 28 Mar 2013 11:20:41 +0000 (12:20 +0100)]
Merge commit 'e9cc98839574c7e8d546e890ebbf57d1766e5d8a'

* commit 'e9cc98839574c7e8d546e890ebbf57d1766e5d8a':
  win32: Allow other programs to open the same files
  configure: Add error_resilience as dependency to the eatqi decoder

Conflicts:
configure
libavformat/os_support.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'
Michael Niedermayer [Thu, 28 Mar 2013 11:12:31 +0000 (12:12 +0100)]
Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'

* commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975':
  ape: use correct context for the bit table printed in debug
  build: Move setting of SRC_DIR to the only place it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3'
Michael Niedermayer [Thu, 28 Mar 2013 11:04:53 +0000 (12:04 +0100)]
Merge commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3'

* commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3':
  build: Remove configure-generated .config file on distclean
  msmpeg4: Split decoding related functions to a separate file

Conflicts:
Makefile
libavcodec/Makefile
libavcodec/msmpeg4.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f'
Michael Niedermayer [Thu, 28 Mar 2013 10:56:05 +0000 (11:56 +0100)]
Merge commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f'

* commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f':
  mpeg12: Move Mpeg1Context declaration to the only place it is used

Conflicts:
libavcodec/mpeg12.h
libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1b6d66745ac1768adb387c2227cdcf4452271149'
Michael Niedermayer [Thu, 28 Mar 2013 10:45:04 +0000 (11:45 +0100)]
Merge commit '1b6d66745ac1768adb387c2227cdcf4452271149'

* commit '1b6d66745ac1768adb387c2227cdcf4452271149':
  Split MPEG-1/2 decoder code off from MPEG-1/2 common code

Conflicts:
libavcodec/Makefile
libavcodec/mpeg12.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'eee2000b41234ae9465c314e18bfec1700181f32'
Michael Niedermayer [Thu, 28 Mar 2013 10:30:21 +0000 (11:30 +0100)]
Merge commit 'eee2000b41234ae9465c314e18bfec1700181f32'

* commit 'eee2000b41234ae9465c314e18bfec1700181f32':
  mpeg12: Move some ff_mpeg1_* function declarations to a more suitable place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'
Michael Niedermayer [Thu, 28 Mar 2013 10:20:41 +0000 (11:20 +0100)]
Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'

* commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa':
  cosmetics: Remove unnecessary extern keywords from function declarations

Conflicts:
libswscale/x86/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1db6a080bddd14fed6b29140ecd2e21e42b1c022'
Michael Niedermayer [Thu, 28 Mar 2013 10:11:00 +0000 (11:11 +0100)]
Merge commit '1db6a080bddd14fed6b29140ecd2e21e42b1c022'

* commit '1db6a080bddd14fed6b29140ecd2e21e42b1c022':
  dca: Move ff_dca_convert_bitstream() to the DCA common code
  vdpau: wrap codec specific functions in appropiate #ifs

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '757d85868b77c4fdec7b77a3b7de1faf16c031e8'
Michael Niedermayer [Thu, 28 Mar 2013 10:07:07 +0000 (11:07 +0100)]
Merge commit '757d85868b77c4fdec7b77a3b7de1faf16c031e8'

* commit '757d85868b77c4fdec7b77a3b7de1faf16c031e8':
  vdpau: fix obsolete mpeg1 vdpau decoder when mpeg2 is disabled

Conflicts:
libavcodec/mpeg12.c

Nothing changes as the buggy code is not in ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'd767e2f969933b4e450ed4e69ea2bf8ca864838c'
Michael Niedermayer [Thu, 28 Mar 2013 09:53:50 +0000 (10:53 +0100)]
Merge commit 'd767e2f969933b4e450ed4e69ea2bf8ca864838c'

* commit 'd767e2f969933b4e450ed4e69ea2bf8ca864838c':
  configure: fix dependencies of XvMC and old vdpau mpeg2 decoders

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovmdav: convert to bytestream2
Alexandra Khirnova [Wed, 13 Mar 2013 12:54:27 +0000 (13:54 +0100)]
vmdav: convert to bytestream2

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoFATE: add a test for the join filter
Anton Khirnov [Wed, 13 Mar 2013 10:03:08 +0000 (11:03 +0100)]
FATE: add a test for the join filter

7 years agoFATE: add a test for the volume filter
Anton Khirnov [Wed, 13 Mar 2013 10:03:08 +0000 (11:03 +0100)]
FATE: add a test for the volume filter

7 years agoFATE: add a test for the channelsplit filter
Anton Khirnov [Wed, 13 Mar 2013 10:03:08 +0000 (11:03 +0100)]
FATE: add a test for the channelsplit filter

7 years agoFATE: add a test for the channelmap filter
Anton Khirnov [Wed, 13 Mar 2013 10:03:08 +0000 (11:03 +0100)]
FATE: add a test for the channelmap filter

7 years agoFATE: add a test for the negate filter
Anton Khirnov [Wed, 13 Mar 2013 10:03:08 +0000 (11:03 +0100)]
FATE: add a test for the negate filter

7 years agoFATE: add a test for the overlay filter
Anton Khirnov [Wed, 13 Mar 2013 10:03:08 +0000 (11:03 +0100)]
FATE: add a test for the overlay filter

7 years agoFATE: add a test for the setpts filter
Anton Khirnov [Wed, 13 Mar 2013 10:03:08 +0000 (11:03 +0100)]
FATE: add a test for the setpts filter

7 years agoFATE: add a test for the hqdn3d filter
Anton Khirnov [Wed, 13 Mar 2013 10:03:08 +0000 (11:03 +0100)]
FATE: add a test for the hqdn3d filter

7 years agoFATE: add a test for the transpose filter
Anton Khirnov [Wed, 13 Mar 2013 10:03:08 +0000 (11:03 +0100)]
FATE: add a test for the transpose filter

7 years agoFATE: add a test for the unsharp filter
Anton Khirnov [Wed, 13 Mar 2013 10:03:08 +0000 (11:03 +0100)]
FATE: add a test for the unsharp filter

7 years agoFATE: add a test for the fade filter
Anton Khirnov [Wed, 13 Mar 2013 10:03:08 +0000 (11:03 +0100)]
FATE: add a test for the fade filter

7 years agoFATE: add a test for the drawbox filter
Anton Khirnov [Wed, 13 Mar 2013 10:03:08 +0000 (11:03 +0100)]
FATE: add a test for the drawbox filter

7 years agoFATE: add a test for the boxblur filter
Anton Khirnov [Wed, 13 Mar 2013 10:03:08 +0000 (11:03 +0100)]
FATE: add a test for the boxblur filter

7 years agoFATE: add a test for the gradfun filter
Anton Khirnov [Wed, 13 Mar 2013 10:03:08 +0000 (11:03 +0100)]
FATE: add a test for the gradfun filter

7 years agolavfi/gradfun: remove rounding to match C and SSE code.
Clément Bœsch [Thu, 6 Dec 2012 23:41:04 +0000 (00:41 +0100)]
lavfi/gradfun: remove rounding to match C and SSE code.

There is no noticable benefit for such precision.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agolavfi/gradfun: fix dithering in MMX code.
Clément Bœsch [Thu, 6 Dec 2012 23:39:31 +0000 (00:39 +0100)]
lavfi/gradfun: fix dithering in MMX code.

Current dithering only uses the first 4 instead of the whole 8 random values.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agolavfi/gradfun: fix rounding in MMX code.
Clément Bœsch [Thu, 6 Dec 2012 23:36:29 +0000 (00:36 +0100)]
lavfi/gradfun: fix rounding in MMX code.

Current code divides before increasing precision.

Also reduce upper bound for strength from 255 to 64.  This will prevent
an overflow in the SSSE3 and MMX filter_line code: delta is expressed as
an u16 being shifted by 2 to the left. If it overflows, having a
strength not above 64 will make sure that m is set to 0 (making the
m*m*delta >> 14 expression void).

A value above 64 should not make any sense unless gradfun is used as
a blur filter.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agolavfi/gradfun: do not increment DC pointer for odd values.
Clément Bœsch [Wed, 5 Dec 2012 03:58:03 +0000 (04:58 +0100)]
lavfi/gradfun: do not increment DC pointer for odd values.

First DC is only used once otherwise. This also makes the code
consistent with ASM versions.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agofate: filter: Add dependencies
Diego Biurrun [Sat, 1 Dec 2012 19:38:26 +0000 (20:38 +0100)]
fate: filter: Add dependencies

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoavconv: add options for reading filtergraphs from a file.
Anton Khirnov [Wed, 13 Mar 2013 13:24:45 +0000 (14:24 +0100)]
avconv: add options for reading filtergraphs from a file.

7 years agoAVOptions: make av_set_options_string() forward options to child objects
Anton Khirnov [Tue, 12 Mar 2013 17:23:27 +0000 (18:23 +0100)]
AVOptions: make av_set_options_string() forward options to child objects

7 years agomlpdec: Fix reading state with 0 bit elements.
Michael Niedermayer [Thu, 28 Mar 2013 02:53:08 +0000 (03:53 +0100)]
mlpdec: Fix reading state with 0 bit elements.

This fixes an assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264_cavlc: fix assertion failure due to reading too long vlc
Michael Niedermayer [Thu, 28 Mar 2013 02:16:01 +0000 (03:16 +0100)]
h264_cavlc: fix assertion failure due to reading too long vlc

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoestimate_timings_from_bit_rate: Check timebase and bitrate
Michael Niedermayer [Thu, 28 Mar 2013 00:43:55 +0000 (01:43 +0100)]
estimate_timings_from_bit_rate: Check timebase and bitrate

Fixes integer overflow and assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoelectronicarts: check timebase, fix assertion failure
Michael Niedermayer [Thu, 28 Mar 2013 00:08:24 +0000 (01:08 +0100)]
electronicarts: check timebase, fix assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovp3: Check fps validity more completely
Michael Niedermayer [Wed, 27 Mar 2013 23:49:02 +0000 (00:49 +0100)]
vp3: Check fps validity more completely

Fix assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowavpack: check K, fix assertion failure
Michael Niedermayer [Wed, 27 Mar 2013 23:23:23 +0000 (00:23 +0100)]
wavpack: check K, fix assertion failure

Instead of this it would be possible to change the code to support
larger K but that would make the code slower and probably still need
checks on K.
This variant is choosen as there are no known valid files that need
larger K

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix heap-buffer-overflow in matroska_parse_block
Dale Curtis [Tue, 26 Mar 2013 21:12:30 +0000 (14:12 -0700)]
Fix heap-buffer-overflow in matroska_parse_block

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosnow: drop commented out asserts
Michael Niedermayer [Wed, 27 Mar 2013 21:55:49 +0000 (22:55 +0100)]
snow: drop commented out asserts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat: change some seeking related assert to av_asserts
Michael Niedermayer [Wed, 27 Mar 2013 21:53:57 +0000 (22:53 +0100)]
avformat: change some seeking related assert to av_asserts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovsrc_mandelbrot: Mandel morphing support
Michael Niedermayer [Wed, 27 Mar 2013 18:24:21 +0000 (19:24 +0100)]
vsrc_mandelbrot: Mandel morphing support

Example: ffplay -f lavfi "mandelbrot=outer=outz:morphamp=1:end_scale=2:maxiter=100"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowin32: Use 64-bit fstat/lseek variants for MSVC as well
Hendrik Leppkes [Tue, 12 Mar 2013 15:45:13 +0000 (16:45 +0100)]
win32: Use 64-bit fstat/lseek variants for MSVC as well

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agowin32: Make ff_win32_open more robust
Reimar Döffinger [Sun, 10 Mar 2013 19:03:19 +0000 (20:03 +0100)]
win32: Make ff_win32_open more robust

- Make MultiByteToWideChar fail when it encounters invalid encoding.
  Without this, invalid characters might just be skipped
- When MultiByteToWideChar fails, assume the file name is in CP_ACP
  and open it via normal open function, even when the file will be
  written
- When malloc fails return error instead of crashing

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agowin32: Allow other programs to open the same files
Reimar Döffinger [Fri, 20 Jan 2012 19:27:22 +0000 (20:27 +0100)]
win32: Allow other programs to open the same files

In order to match Linux behaviour better our Windows-specific
open() replacement should disable Windows default file locking.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoconfigure: Add error_resilience as dependency to the eatqi decoder
Martin Storsjö [Tue, 26 Mar 2013 09:04:08 +0000 (11:04 +0200)]
configure: Add error_resilience as dependency to the eatqi decoder

This makes standalone compilation of the eatqi decoder
succeed. The dependency comes from the shared mpeg12dec.o file.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomandelbrot: add outer coloring method showing bailouted z
Michael Niedermayer [Wed, 27 Mar 2013 15:19:50 +0000 (16:19 +0100)]
mandelbrot: add outer coloring method showing bailouted z

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoape: use correct context for the bit table printed in debug
Kostya Shishkov [Wed, 27 Mar 2013 07:57:08 +0000 (08:57 +0100)]
ape: use correct context for the bit table printed in debug

7 years agovsrc_mandelbrot: support coloring the outside white
Michael Niedermayer [Wed, 27 Mar 2013 15:00:18 +0000 (16:00 +0100)]
vsrc_mandelbrot: support coloring the outside white

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild: Remove configure-generated .config file on distclean
Diego Biurrun [Mon, 25 Mar 2013 10:52:52 +0000 (11:52 +0100)]
build: Remove configure-generated .config file on distclean

7 years agobuild: Move setting of SRC_DIR to the only place it is used
Diego Biurrun [Fri, 1 Mar 2013 18:52:32 +0000 (19:52 +0100)]
build: Move setting of SRC_DIR to the only place it is used

7 years agomsmpeg4: Split decoding related functions to a separate file
Martin Storsjö [Tue, 26 Mar 2013 13:48:24 +0000 (15:48 +0200)]
msmpeg4: Split decoding related functions to a separate file

This fixes standalone compilation of the msmpeg4v2, msmpeg4v3
and wmv2 encoders, that previously failed to link due to the
decoder codepaths requiring error_resilience.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agompeg12: Move Mpeg1Context declaration to the only place it is used
Diego Biurrun [Tue, 26 Mar 2013 18:52:21 +0000 (19:52 +0100)]
mpeg12: Move Mpeg1Context declaration to the only place it is used

7 years agoSplit MPEG-1/2 decoder code off from MPEG-1/2 common code
Diego Biurrun [Tue, 26 Mar 2013 18:50:40 +0000 (19:50 +0100)]
Split MPEG-1/2 decoder code off from MPEG-1/2 common code

7 years agompeg12: Move some ff_mpeg1_* function declarations to a more suitable place
Diego Biurrun [Tue, 26 Mar 2013 17:25:01 +0000 (18:25 +0100)]
mpeg12: Move some ff_mpeg1_* function declarations to a more suitable place

7 years agocosmetics: Remove unnecessary extern keywords from function declarations
Diego Biurrun [Tue, 26 Mar 2013 17:41:24 +0000 (18:41 +0100)]
cosmetics: Remove unnecessary extern keywords from function declarations

7 years agodca: Move ff_dca_convert_bitstream() to the DCA common code
Diego Biurrun [Tue, 26 Mar 2013 17:17:57 +0000 (18:17 +0100)]
dca: Move ff_dca_convert_bitstream() to the DCA common code

This makes the DCA parser and decoder independent.

7 years agovdpau: wrap codec specific functions in appropiate #ifs
Janne Grunau [Tue, 26 Mar 2013 21:47:29 +0000 (22:47 +0100)]
vdpau: wrap codec specific functions in appropiate #ifs

Fixes linking when only a subset of the deprecated vdpau decoders is
enabled.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 27 Mar 2013 10:51:33 +0000 (11:51 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hwaccel: fix use with frame based multithreading

Conflicts:
libavcodec/h263dec.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'c24469e812501903a46a06eff9722a82e136e841'
Michael Niedermayer [Wed, 27 Mar 2013 10:42:15 +0000 (11:42 +0100)]
Merge commit 'c24469e812501903a46a06eff9722a82e136e841'

* commit 'c24469e812501903a46a06eff9722a82e136e841':
  utils: add workaround for AVHWAccel in ff_get_buffer compat code
  configure: Remove a stray msmpeg4v1 encoder declaration

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '3b2d0ec473b036bdd0a5bc0d896fd5292915f44d'
Michael Niedermayer [Wed, 27 Mar 2013 10:32:45 +0000 (11:32 +0100)]
Merge commit '3b2d0ec473b036bdd0a5bc0d896fd5292915f44d'

* commit '3b2d0ec473b036bdd0a5bc0d896fd5292915f44d':
  configure: Remove the mpegvideo dependency from svq1
  x86: vc1dsp: Fix indentation

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoUpdate MAINTAINERS with information about avisynth demuxer.
d s [Wed, 27 Mar 2013 02:36:44 +0000 (19:36 -0700)]
Update MAINTAINERS with information about avisynth demuxer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix avisynth_context_create constructor error handling.
d s [Wed, 27 Mar 2013 02:36:18 +0000 (19:36 -0700)]
Fix avisynth_context_create constructor error handling.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoSupport pcm_mulaw in Hikvision CCTV mpeg program streams.
Carl Eugen Hoyos [Wed, 27 Mar 2013 00:48:07 +0000 (01:48 +0100)]
Support pcm_mulaw in Hikvision CCTV mpeg program streams.

Fixes decoding the sample from videolan trac ticket #8344.

7 years agoFix a typo in the Monkey's Audio demuxer.
Carl Eugen Hoyos [Wed, 27 Mar 2013 00:55:11 +0000 (01:55 +0100)]
Fix a typo in the Monkey's Audio demuxer.

7 years agodoc: "av* tools" -> "ff* tools".
Clément Bœsch [Wed, 27 Mar 2013 00:43:37 +0000 (01:43 +0100)]
doc: "av* tools" -> "ff* tools".

Spotted-by: Timothy Gu <timothygu99@gmail.com>
7 years agotests/tiny_ssim: include the 2 macros instead of a header
Michael Niedermayer [Wed, 27 Mar 2013 00:38:18 +0000 (01:38 +0100)]
tests/tiny_ssim: include the 2 macros instead of a header

Should fix compilation on open solaris

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovdpau: fix obsolete mpeg1 vdpau decoder when mpeg2 is disabled
Janne Grunau [Tue, 26 Mar 2013 21:45:40 +0000 (22:45 +0100)]
vdpau: fix obsolete mpeg1 vdpau decoder when mpeg2 is disabled

7 years agoconfigure: fix dependencies of XvMC and old vdpau mpeg2 decoders
Janne Grunau [Tue, 26 Mar 2013 18:59:36 +0000 (19:59 +0100)]
configure: fix dependencies of XvMC and old vdpau mpeg2 decoders

7 years agompegvideo: fix null pointer dereference on switching streams
Michael Niedermayer [Tue, 26 Mar 2013 20:54:36 +0000 (21:54 +0100)]
mpegvideo: fix null pointer dereference on switching streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohwaccel: fix use with frame based multithreading
Janne Grunau [Wed, 13 Mar 2013 22:36:51 +0000 (23:36 +0100)]
hwaccel: fix use with frame based multithreading

Allows use of AVHWAccel based decoders with frame based multithreading.
The decoders will be forced into an non-concurrent mode by delaying
ff_thread_finish_setup() calls after decoding of the current frame
is finished.

This wastes memory by unnecessarily using multiple threads and thus
copies of the decoder context but allows seamless switching between
hardware accelerated and frame threaded software decoding when the
hardware decoder does not support the stream.

7 years agoutils: add workaround for AVHWAccel in ff_get_buffer compat code
Janne Grunau [Mon, 25 Mar 2013 16:28:37 +0000 (17:28 +0100)]
utils: add workaround for AVHWAccel in ff_get_buffer compat code

Since c977039e585bfff28ecc037ef827c6c3d1ed88aa plane count for
PIX_FMT_HWACCEL pixel formats is 0 instead of 1. The created dummy
AVBuffers are still bogus since AVFrame does not hold frame data when
AVHWAccels are used.

7 years agompegvideo/h264: drop period_since_free
Michael Niedermayer [Tue, 26 Mar 2013 18:27:32 +0000 (19:27 +0100)]
mpegvideo/h264: drop period_since_free

This should not be needed anymore

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotiny_ssim: Avoid "for(int ..."
Michael Niedermayer [Tue, 26 Mar 2013 18:26:44 +0000 (19:26 +0100)]
tiny_ssim: Avoid "for(int ..."

This should avoid issues with old compilers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotools: add tiny_ssim
Loren Merritt [Sun, 24 Mar 2013 15:04:48 +0000 (16:04 +0100)]
tools: add tiny_ssim

Taken from:
http://lists.mplayerhq.hu/pipermail/mencoder-users/2006-August/003801.html
and
x264
See: [FFmpeg-devel] [PATCH] tools: add tiny_ssim

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>