ffmpeg.git
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 24 Feb 2013 17:02:37 +0000 (18:02 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: List external libs used using print_enabled()

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3fc09b0081184f26edbb62d2d72ae89bf9e21768'
Michael Niedermayer [Sun, 24 Feb 2013 16:55:31 +0000 (17:55 +0100)]
Merge commit '3fc09b0081184f26edbb62d2d72ae89bf9e21768'

* commit '3fc09b0081184f26edbb62d2d72ae89bf9e21768':
  configure: Move list of external libs to a separate variable

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '45235ac488363e3360bf2f2275102d1ec66eba0f'
Michael Niedermayer [Sun, 24 Feb 2013 16:45:06 +0000 (17:45 +0100)]
Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f'

* commit '45235ac488363e3360bf2f2275102d1ec66eba0f':
  configure: Move x11grab option to a more suitable place in the help output
  lavr: allow setting internal_sample_fmt option by string
  lavr: Add "resample_cutoff" option as a duplicate of "cutoff"

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'
Michael Niedermayer [Sun, 24 Feb 2013 16:30:52 +0000 (17:30 +0100)]
Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'

* commit '5c7db097ebe1fb5c233cedd8846615074e7d6044':
  avconv: pass libavresample options to AVFilterGraph

Conflicts:
cmdutils.c
cmdutils.h
ffmpeg_filter.c
ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9f1223562e134bac6345a465870b9d56ff7d60cf'
Michael Niedermayer [Sun, 24 Feb 2013 16:10:55 +0000 (17:10 +0100)]
Merge commit '9f1223562e134bac6345a465870b9d56ff7d60cf'

* commit '9f1223562e134bac6345a465870b9d56ff7d60cf':
  lavfi: connect libavresample options to af_resample via AVFilterGraph

Conflicts:
doc/APIchanges
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.h
libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd7c450436fcb9d3ecf59884a574e7684183e753d'
Michael Niedermayer [Sun, 24 Feb 2013 15:53:09 +0000 (16:53 +0100)]
Merge commit 'd7c450436fcb9d3ecf59884a574e7684183e753d'

* commit 'd7c450436fcb9d3ecf59884a574e7684183e753d':
  ac3dec: validate channel output mode against channel count

Conflicts:
libavcodec/ac3dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: hwaccel autodetection has been removed in 82ca17ac7a0a08784cb6808384ee237a...
Michael Niedermayer [Sun, 24 Feb 2013 15:40:46 +0000 (16:40 +0100)]
configure: hwaccel autodetection has been removed in 82ca17ac7a0a08784cb6808384ee237ac28e8334

If you want it back (yeah i want it back too)
then you just need to volunteer to maintain the code in configure
thats related to hwaccel autodetection.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Simplify VDPAU header check
Diego Biurrun [Thu, 21 Feb 2013 11:34:42 +0000 (12:34 +0100)]
configure: Simplify VDPAU header check

Conflicts:

configure

6 years agoMerge commit '82ca17ac7a0a08784cb6808384ee237ac28e8334'
Michael Niedermayer [Sun, 24 Feb 2013 14:45:45 +0000 (15:45 +0100)]
Merge commit '82ca17ac7a0a08784cb6808384ee237ac28e8334'

* commit '82ca17ac7a0a08784cb6808384ee237ac28e8334':
  configure: Fix vaapi/vda/vdpau dependency declarations

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '215cdd35efd625ec28ef5846f1692b18f7c2c230'
Michael Niedermayer [Sun, 24 Feb 2013 14:37:11 +0000 (15:37 +0100)]
Merge commit '215cdd35efd625ec28ef5846f1692b18f7c2c230'

* commit '215cdd35efd625ec28ef5846f1692b18f7c2c230':
  configure: Refactor dxva2api.h dependency declarations

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoexr: make sure that data_size is not bigger than expected
Paul B Mahol [Sun, 24 Feb 2013 14:10:20 +0000 (14:10 +0000)]
exr: make sure that data_size is not bigger than expected

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoexr: simplify filling channel_buffer[]
Paul B Mahol [Sun, 24 Feb 2013 12:28:22 +0000 (12:28 +0000)]
exr: simplify filling channel_buffer[]

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoexr: check color channel subsampling too
Paul B Mahol [Sun, 24 Feb 2013 11:12:59 +0000 (11:12 +0000)]
exr: check color channel subsampling too

If there is unsupported subsampling encountered abort
early instead of failing decoding later.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoexr: slice threading
Paul B Mahol [Fri, 22 Feb 2013 13:34:12 +0000 (13:34 +0000)]
exr: slice threading

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge commit '4cc4b33f71d3982df404fceb4405d656c538bc74'
Michael Niedermayer [Sun, 24 Feb 2013 14:24:38 +0000 (15:24 +0100)]
Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74'

* commit '4cc4b33f71d3982df404fceb4405d656c538bc74':
  build: Add proper infrastructure for adding and checking host CPPFLAGS

Conflicts:
Makefile
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2aac411fd4c74e22b978525206f3b8257de1842b'
Michael Niedermayer [Sun, 24 Feb 2013 14:06:44 +0000 (15:06 +0100)]
Merge commit '2aac411fd4c74e22b978525206f3b8257de1842b'

* commit '2aac411fd4c74e22b978525206f3b8257de1842b':
  configure: Simplify VDPAU header check

Conflicts:
configure

Not merged as the code seems not to work

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9840130edf3a969ec06dd0faa61dcf8d90c5f67a'
Michael Niedermayer [Sun, 24 Feb 2013 13:58:06 +0000 (14:58 +0100)]
Merge commit '9840130edf3a969ec06dd0faa61dcf8d90c5f67a'

* commit '9840130edf3a969ec06dd0faa61dcf8d90c5f67a':
  configure: Simplify VDA header and extralibs check

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0a8da1a3e5f0b9329dfb89d17356ff5444c02351'
Michael Niedermayer [Sun, 24 Feb 2013 13:42:12 +0000 (14:42 +0100)]
Merge commit '0a8da1a3e5f0b9329dfb89d17356ff5444c02351'

* commit '0a8da1a3e5f0b9329dfb89d17356ff5444c02351':
  configure: Do not redundantly list enabled hwaccel libs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7432e872066d6960a9fbd31c51a94ebe6183389e'
Michael Niedermayer [Sun, 24 Feb 2013 13:37:44 +0000 (14:37 +0100)]
Merge commit '7432e872066d6960a9fbd31c51a94ebe6183389e'

* commit '7432e872066d6960a9fbd31c51a94ebe6183389e':
  configure: Add print_3_columns helper function and use where appropriate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '040c565e51985477a8fa5e42d2ddfb26ebde6608'
Michael Niedermayer [Sun, 24 Feb 2013 13:32:55 +0000 (14:32 +0100)]
Merge commit '040c565e51985477a8fa5e42d2ddfb26ebde6608'

* commit '040c565e51985477a8fa5e42d2ddfb26ebde6608':
  doc: developer: Allow tabs in the vim configuration for Automake files
  Remove pointless av_cold attributes in header files

Conflicts:
libavcodec/h264.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopnm: use av_pix_fmt_desc_get()
Michael Niedermayer [Sun, 24 Feb 2013 13:27:08 +0000 (14:27 +0100)]
pnm: use av_pix_fmt_desc_get()

Using the table directly may cause problems on some platforms like msvc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b5f536d24b5ae360503935c34d5d59fa5181b94d'
Michael Niedermayer [Sun, 24 Feb 2013 13:14:28 +0000 (14:14 +0100)]
Merge commit 'b5f536d24b5ae360503935c34d5d59fa5181b94d'

* commit 'b5f536d24b5ae360503935c34d5d59fa5181b94d':
  pnm: add high-bitdepth PGMYUV support for both encoder and decoder

Conflicts:
libavcodec/pnm.c
libavcodec/pnmdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2'
Michael Niedermayer [Sun, 24 Feb 2013 13:05:16 +0000 (14:05 +0100)]
Merge commit '2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2'

* commit '2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2':
  libx264: change i_qfactor to use x264cli's default
  qtrle: use AV_LOG_ERROR in an error message.

Conflicts:
libavcodec/libx264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7b4f91155bd4ef5a8d4e9af65c48b42bfa5b52c6'
Michael Niedermayer [Sun, 24 Feb 2013 12:55:27 +0000 (13:55 +0100)]
Merge commit '7b4f91155bd4ef5a8d4e9af65c48b42bfa5b52c6'

* commit '7b4f91155bd4ef5a8d4e9af65c48b42bfa5b52c6':
  qtrle: cosmetics, reformat CHECK_PIXEL_PTR() macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e10659244782b26061e7d52c06437de32a43a7af'
Michael Niedermayer [Sun, 24 Feb 2013 12:49:37 +0000 (13:49 +0100)]
Merge commit 'e10659244782b26061e7d52c06437de32a43a7af'

* commit 'e10659244782b26061e7d52c06437de32a43a7af':
  qtrle: add more checks against pixel_ptr being negative.

Conflicts:
libavcodec/qtrle.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4f3b058c84f570e261d743c7c22f865617fd28ac'
Michael Niedermayer [Sun, 24 Feb 2013 12:20:25 +0000 (13:20 +0100)]
Merge commit '4f3b058c84f570e261d743c7c22f865617fd28ac'

* commit '4f3b058c84f570e261d743c7c22f865617fd28ac':
  cavs: initialize various context tables to 0
  mlpdec: do not try to allocate a zero-sized output buffer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '56daf10e0313c5e36f43e773f457d2a99ff0df10'
Michael Niedermayer [Sun, 24 Feb 2013 12:15:52 +0000 (13:15 +0100)]
Merge commit '56daf10e0313c5e36f43e773f457d2a99ff0df10'

* commit '56daf10e0313c5e36f43e773f457d2a99ff0df10':
  mov: use the format context for logging.
  flicvideo: avoid an infinite loop in byte run compression

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/concatdec: add the "duration" directive.
Nicolas George [Wed, 13 Feb 2013 16:25:56 +0000 (17:25 +0100)]
lavf/concatdec: add the "duration" directive.

6 years agotools: add seek_print.
Nicolas George [Wed, 13 Feb 2013 18:15:45 +0000 (19:15 +0100)]
tools: add seek_print.

Useful for testing seek implementations.

6 years agoloco: check the last plane too
Michael Niedermayer [Sun, 24 Feb 2013 12:03:13 +0000 (13:03 +0100)]
loco: check the last plane too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '067432c1c95882c7221e694f33d9f3bdbe46de7f'
Michael Niedermayer [Sun, 24 Feb 2013 11:57:08 +0000 (12:57 +0100)]
Merge commit '067432c1c95882c7221e694f33d9f3bdbe46de7f'

* commit '067432c1c95882c7221e694f33d9f3bdbe46de7f':
  loco: check that there is data left after decoding a plane.
  lagarith: avoid infinite loop in lag_rac_refill()

Conflicts:
libavcodec/loco.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f935aca44c674d30e3ed940ef73bbad1228a5855'
Michael Niedermayer [Sun, 24 Feb 2013 11:22:51 +0000 (12:22 +0100)]
Merge commit 'f935aca44c674d30e3ed940ef73bbad1228a5855'

* commit 'f935aca44c674d30e3ed940ef73bbad1228a5855':
  av_memcpy_backptr: avoid an infinite loop for back = 0
  4xm: check the return value of read_huffman_tables().

Conflicts:
libavcodec/4xm.c
libavutil/mem.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: check return values consistency when decoding subtitles.
Nicolas George [Wed, 13 Feb 2013 09:40:41 +0000 (10:40 +0100)]
lavc: check return values consistency when decoding subtitles.

6 years agolavfi/formats: reindent after last commit.
Nicolas George [Sun, 24 Feb 2013 11:05:06 +0000 (12:05 +0100)]
lavfi/formats: reindent after last commit.

6 years agolavfi: fix merging of formats and clarify exception.
Nicolas George [Thu, 21 Feb 2013 13:02:13 +0000 (14:02 +0100)]
lavfi: fix merging of formats and clarify exception.

The following commit:
b97d61f avfilter/ff_merge_formats: only merge if doing so does not loose chroma or alpha
introduced an exception to avoid lossy conversions.
Add a comment to explain the logic.
Fix the call to avoid applying it on audio formats.

6 years agolavf/avio: check that the protocol supports the open mode.
Nicolas George [Wed, 13 Feb 2013 12:28:57 +0000 (13:28 +0100)]
lavf/avio: check that the protocol supports the open mode.

Fix trac ticket #2139.

6 years agolibavfilter/af_amerge: fix segfault if init fails.
Nicolas George [Thu, 21 Feb 2013 19:15:08 +0000 (20:15 +0100)]
libavfilter/af_amerge: fix segfault if init fails.

6 years agoconfigure: List external libs used using print_enabled()
Mans Rullgard [Sat, 27 Oct 2012 21:25:27 +0000 (22:25 +0100)]
configure: List external libs used using print_enabled()

This cuts some lines from the script as well as the output and
simplifies maintenance.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoconfigure: Move list of external libs to a separate variable
Mans Rullgard [Sat, 27 Oct 2012 19:02:33 +0000 (20:02 +0100)]
configure: Move list of external libs to a separate variable

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoconfigure: Move x11grab option to a more suitable place in the help output
Diego Biurrun [Sat, 23 Feb 2013 22:01:27 +0000 (23:01 +0100)]
configure: Move x11grab option to a more suitable place in the help output

6 years agopmpdec: check packet sizes
Michael Niedermayer [Sat, 23 Feb 2013 21:05:30 +0000 (22:05 +0100)]
pmpdec: check packet sizes

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopmpdec: fix signedness
Michael Niedermayer [Sat, 23 Feb 2013 20:50:22 +0000 (21:50 +0100)]
pmpdec: fix signedness

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopmpdec: read index before creating audio streams
Michael Niedermayer [Sat, 23 Feb 2013 20:47:15 +0000 (21:47 +0100)]
pmpdec: read index before creating audio streams

This allows more complete checks

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopmpdec: check for EOF while reading index.
Reimar Döffinger [Sat, 23 Feb 2013 18:44:46 +0000 (19:44 +0100)]
pmpdec: check for EOF while reading index.

Otherwise even a tiny file can trigger a huge memory allocation.

Related to ticket #2298.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agoavformat: Allocate duration_error separately
Michael Niedermayer [Sat, 23 Feb 2013 21:25:49 +0000 (22:25 +0100)]
avformat: Allocate duration_error separately

This significantly reduces the memory needed per AVStream when the
array is not needed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavconv: pass libavresample options to AVFilterGraph
Justin Ruggles [Wed, 19 Dec 2012 02:47:28 +0000 (21:47 -0500)]
avconv: pass libavresample options to AVFilterGraph

6 years agolavfi: connect libavresample options to af_resample via AVFilterGraph
Justin Ruggles [Wed, 19 Dec 2012 02:27:35 +0000 (21:27 -0500)]
lavfi: connect libavresample options to af_resample via AVFilterGraph

6 years agolavr: allow setting internal_sample_fmt option by string
Justin Ruggles [Wed, 2 Jan 2013 21:47:28 +0000 (16:47 -0500)]
lavr: allow setting internal_sample_fmt option by string

6 years agolavr: Add "resample_cutoff" option as a duplicate of "cutoff"
Justin Ruggles [Wed, 19 Dec 2012 02:52:58 +0000 (21:52 -0500)]
lavr: Add "resample_cutoff" option as a duplicate of "cutoff"

Avoids an option name conflict with libavcodec, which is needed in order
to work properly with avconv.

6 years agomatroskaenc: fix cue tracknum off by 1 error
Michael Niedermayer [Sat, 23 Feb 2013 22:05:44 +0000 (23:05 +0100)]
matroskaenc: fix cue tracknum off by 1 error

Fixes out of array accesses

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoac3dec: validate channel output mode against channel count
Justin Ruggles [Wed, 20 Feb 2013 16:41:20 +0000 (11:41 -0500)]
ac3dec: validate channel output mode against channel count

Damaged frames can lead to a mismatch, which can cause a segfault
due to using an incorrect channel mapping.

CC:libav-stable@libav.org

6 years agoconfigure: Fix vaapi/vda/vdpau dependency declarations
Diego Biurrun [Thu, 21 Feb 2013 11:35:40 +0000 (12:35 +0100)]
configure: Fix vaapi/vda/vdpau dependency declarations

6 years agoconfigure: Refactor dxva2api.h dependency declarations
Diego Biurrun [Thu, 21 Feb 2013 11:39:20 +0000 (12:39 +0100)]
configure: Refactor dxva2api.h dependency declarations

6 years agobuild: Add proper infrastructure for adding and checking host CPPFLAGS
Diego Biurrun [Sun, 3 Feb 2013 14:13:17 +0000 (15:13 +0100)]
build: Add proper infrastructure for adding and checking host CPPFLAGS

6 years agoconfigure: Simplify VDPAU header check
Diego Biurrun [Thu, 21 Feb 2013 11:34:42 +0000 (12:34 +0100)]
configure: Simplify VDPAU header check

6 years agoconfigure: Simplify VDA header and extralibs check
Diego Biurrun [Thu, 21 Feb 2013 11:31:15 +0000 (12:31 +0100)]
configure: Simplify VDA header and extralibs check

6 years agoconfigure: Do not redundantly list enabled hwaccel libs
Mans Rullgard [Wed, 31 Oct 2012 16:46:05 +0000 (16:46 +0000)]
configure: Do not redundantly list enabled hwaccel libs

The enabled hwaccels are listed later anyway.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoconfigure: Add print_3_columns helper function and use where appropriate
Diego Biurrun [Thu, 21 Feb 2013 15:43:47 +0000 (16:43 +0100)]
configure: Add print_3_columns helper function and use where appropriate

6 years agodoc: developer: Allow tabs in the vim configuration for Automake files
Diego Biurrun [Fri, 22 Feb 2013 21:06:37 +0000 (22:06 +0100)]
doc: developer: Allow tabs in the vim configuration for Automake files

While we do not use Automake in libav, this allows our config to be
used more globally without introducing unwanted breakage.

6 years agoRemove pointless av_cold attributes in header files
Diego Biurrun [Sat, 9 Feb 2013 15:19:27 +0000 (16:19 +0100)]
Remove pointless av_cold attributes in header files

The init functions marked as av_cold have to be executed in any case,
so there is no gain from trying to mark paths leading to such functions
as unlikely.

6 years agovf_mp: Set pseudo pal
Michael Niedermayer [Sat, 23 Feb 2013 18:25:46 +0000 (19:25 +0100)]
vf_mp: Set pseudo pal

Fixes ticket2140
Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortmpproto: increase APP_MAX_LENGTH
Michael Niedermayer [Sat, 23 Feb 2013 16:24:15 +0000 (17:24 +0100)]
rtmpproto: increase APP_MAX_LENGTH

Fixes second part of Ticket2292

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortmpproto: Check APP_MAX_LENGTH
Michael Niedermayer [Sat, 23 Feb 2013 15:58:01 +0000 (16:58 +0100)]
rtmpproto: Check APP_MAX_LENGTH

Fixes Ticket2292

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopnm: add high-bitdepth PGMYUV support for both encoder and decoder
Kostya Shishkov [Fri, 22 Feb 2013 10:57:59 +0000 (11:57 +0100)]
pnm: add high-bitdepth PGMYUV support for both encoder and decoder

6 years agodoc/filters: add forgotten sentence for blend filter examples
Paul B Mahol [Sat, 23 Feb 2013 14:26:21 +0000 (14:26 +0000)]
doc/filters: add forgotten sentence for blend filter examples

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoh264: Silence warning: comparison of distinct pointer types lacks a cast
Michael Niedermayer [Sat, 23 Feb 2013 13:09:04 +0000 (14:09 +0100)]
h264: Silence warning: comparison of distinct pointer types lacks a cast

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobmp: Fix warning X may be used uninitialized in this function
Michael Niedermayer [Sat, 23 Feb 2013 13:03:18 +0000 (14:03 +0100)]
bmp: Fix warning X may be used uninitialized in this function

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibx264: change i_qfactor to use x264cli's default
John Van Sickle [Tue, 25 Sep 2012 16:29:22 +0000 (12:29 -0400)]
libx264: change i_qfactor to use x264cli's default

This also allows libx264 to modify its i_qfactor value
when using the "-tune" setting. Previously it had a static
value of 1.25

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoqtrle: use AV_LOG_ERROR in an error message.
Anton Khirnov [Thu, 14 Feb 2013 17:00:39 +0000 (18:00 +0100)]
qtrle: use AV_LOG_ERROR in an error message.

6 years agoqtrle: cosmetics, reformat CHECK_PIXEL_PTR() macro
Anton Khirnov [Thu, 14 Feb 2013 17:00:11 +0000 (18:00 +0100)]
qtrle: cosmetics, reformat CHECK_PIXEL_PTR() macro

6 years agoqtrle: add more checks against pixel_ptr being negative.
Anton Khirnov [Thu, 14 Feb 2013 16:58:12 +0000 (17:58 +0100)]
qtrle: add more checks against pixel_ptr being negative.

CC:libav-stable@libav.org

6 years agocavs: initialize various context tables to 0
Anton Khirnov [Thu, 14 Feb 2013 13:39:41 +0000 (14:39 +0100)]
cavs: initialize various context tables to 0

Avoids crashes with corrupted files.

CC:libav-stable@libav.org

6 years agomlpdec: do not try to allocate a zero-sized output buffer.
Anton Khirnov [Thu, 14 Feb 2013 13:05:35 +0000 (14:05 +0100)]
mlpdec: do not try to allocate a zero-sized output buffer.

CC:libav-stable@libav.org

6 years agomov: use the format context for logging.
Anton Khirnov [Thu, 14 Feb 2013 11:47:43 +0000 (12:47 +0100)]
mov: use the format context for logging.

CC:libav-stable@libav.org

6 years agoaacdec: Fix warning: initialization from incompatible pointer type
Michael Niedermayer [Sat, 23 Feb 2013 11:16:28 +0000 (12:16 +0100)]
aacdec: Fix warning: initialization from incompatible pointer type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_overlay: silence warning: X may be used uninitialized in this function
Michael Niedermayer [Sat, 23 Feb 2013 11:10:35 +0000 (12:10 +0100)]
vf_overlay: silence warning: X may be used uninitialized in this function

Also ensure that format is valid in query_formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter: Silence warning: passing argument 3 of av_image_copy from incompatible...
Michael Niedermayer [Sat, 23 Feb 2013 11:08:05 +0000 (12:08 +0100)]
avfilter: Silence warning: passing argument 3 of av_image_copy from incompatible pointer type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflicvideo: avoid an infinite loop in byte run compression
Anton Khirnov [Thu, 14 Feb 2013 11:40:36 +0000 (12:40 +0100)]
flicvideo: avoid an infinite loop in byte run compression

When byte_run is 0, pixel_countdown is not touched and the loop will run
forever.

CC:libav-stable@libav.org

6 years agoloco: check that there is data left after decoding a plane.
Anton Khirnov [Thu, 14 Feb 2013 08:08:35 +0000 (09:08 +0100)]
loco: check that there is data left after decoding a plane.

CC:libav-stable@libav.org

6 years agolagarith: avoid infinite loop in lag_rac_refill()
Anton Khirnov [Thu, 14 Feb 2013 07:47:17 +0000 (08:47 +0100)]
lagarith: avoid infinite loop in lag_rac_refill()

range == 0 happens with corrupted files

CC:libav-stable@libav.org

6 years agoav_memcpy_backptr: avoid an infinite loop for back = 0
Anton Khirnov [Wed, 13 Feb 2013 20:36:25 +0000 (21:36 +0100)]
av_memcpy_backptr: avoid an infinite loop for back = 0

CC:libav-stable@libav.org

6 years ago4xm: check the return value of read_huffman_tables().
Anton Khirnov [Wed, 13 Feb 2013 19:46:08 +0000 (20:46 +0100)]
4xm: check the return value of read_huffman_tables().

CC:libav-stable@libav.org

6 years agofate/subtitles: add character encoding conversion test.
Clément Bœsch [Wed, 20 Feb 2013 13:01:48 +0000 (14:01 +0100)]
fate/subtitles: add character encoding conversion test.

6 years agotests: fix parseutils test after 12a269a5229d3a37be0743fc9655f743ebc44b6e
Stefano Sabatini [Fri, 22 Feb 2013 23:18:34 +0000 (00:18 +0100)]
tests: fix parseutils test after 12a269a5229d3a37be0743fc9655f743ebc44b6e

"12:34" is now valid syntax.

6 years agodoc/muxers: fix reference to @anchor defined in another manual
Stefano Sabatini [Fri, 22 Feb 2013 22:48:55 +0000 (23:48 +0100)]
doc/muxers: fix reference to @anchor defined in another manual

In particular, fix warnings:
*** Undefined node `quoting_and_escaping' in @ref (in doc/muxers.texi l. 767)
*** Undefined node `quoting_and_escaping' in @ref (in doc/muxers.texi l. 772)

6 years agolavu/parseutils: remove spurious "]]" in date format specification
Stefano Sabatini [Fri, 22 Feb 2013 22:45:31 +0000 (23:45 +0100)]
lavu/parseutils: remove spurious "]]" in date format specification

6 years agolavu/parseutils: allow MM:SS format for duration in av_parse_time()
Senthilnathan M [Wed, 20 Feb 2013 04:21:06 +0000 (09:51 +0530)]
lavu/parseutils: allow MM:SS format for duration in av_parse_time()

Fix trac ticket #2258.

Signed-off-by: Senthilnathan M <senthilnathan.maadasamy@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agoImprove QTRLE encoding performance, no change to output file size/content.
Malcolm Bechard [Wed, 20 Feb 2013 20:50:34 +0000 (15:50 -0500)]
Improve QTRLE encoding performance, no change to output file size/content.

Avoid searching for the lowest bulk cost for each pixel that isn't a repeat/skip. Instead store the lowest cost as we go along each pixel, and use it as needed.

Signed-off-by: Malcolm Bechard <malcolm.bechard@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/mem: do a small set of checks for memalign hack before freeing.
Michael Niedermayer [Fri, 22 Feb 2013 19:30:52 +0000 (20:30 +0100)]
avutil/mem: do a small set of checks for memalign hack before freeing.

These can detect some kinds of memory and or pointer corruptions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoexr: shorter channel buffer names
Paul B Mahol [Fri, 22 Feb 2013 12:17:17 +0000 (12:17 +0000)]
exr: shorter channel buffer names

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoexr: remove superfluous check
Paul B Mahol [Thu, 21 Feb 2013 19:30:26 +0000 (19:30 +0000)]
exr: remove superfluous check

get_header_variable_length() already check for
out of array read and returns 0 in such case.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoexr: cosmetics: reindent
Paul B Mahol [Thu, 21 Feb 2013 12:55:25 +0000 (12:55 +0000)]
exr: cosmetics: reindent

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoexr: check if line offset table is complete only once per frame
Paul B Mahol [Thu, 21 Feb 2013 12:30:40 +0000 (12:30 +0000)]
exr: check if line offset table is complete only once per frame

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoexr: support more line orders
Paul B Mahol [Wed, 20 Feb 2013 13:38:24 +0000 (13:38 +0000)]
exr: support more line orders

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoexr: fix overflow check in lineoffset processing
Paul B Mahol [Wed, 20 Feb 2013 11:33:44 +0000 (11:33 +0000)]
exr: fix overflow check in lineoffset processing

Also read data size for raw compressions too and
make sure its value is sane.

Remove code that fills missing blocks with zeroes.
It is marginally useful and make implementation
of actually useful features harder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoexr: merge multiple if () blocks
Paul B Mahol [Wed, 20 Feb 2013 10:44:39 +0000 (10:44 +0000)]
exr: merge multiple if () blocks

Remove useless comments.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoexr: check version too
Paul B Mahol [Wed, 20 Feb 2013 10:32:22 +0000 (10:32 +0000)]
exr: check version too

Separate version from flags.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodoc/filters: apply minor spacing fixes to boxblur docs
Stefano Sabatini [Fri, 22 Feb 2013 18:57:54 +0000 (19:57 +0100)]
doc/filters: apply minor spacing fixes to boxblur docs

6 years agolavfi/boxblur: add support to named options
Stefano Sabatini [Wed, 20 Feb 2013 14:45:02 +0000 (15:45 +0100)]
lavfi/boxblur: add support to named options

6 years agoaac: reconfigure output on pop
Michael Niedermayer [Fri, 22 Feb 2013 16:33:22 +0000 (17:33 +0100)]
aac: reconfigure output on pop

Fixes Ticket1918

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