ffmpeg.git
7 years agodoc/filters: add bit-slicing example in lutyuv docs
Stefano Sabatini [Wed, 13 Mar 2013 21:36:06 +0000 (22:36 +0100)]
doc/filters: add bit-slicing example in lutyuv docs

7 years agolavu/eval: add bitor and bitand functions
Stefano Sabatini [Wed, 13 Mar 2013 13:09:10 +0000 (14:09 +0100)]
lavu/eval: add bitor and bitand functions

Warning note suggested by Reimar.

7 years agolavfi: let gcc realign the stack on public graph driving functions
Hendrik Leppkes [Fri, 15 Mar 2013 19:44:57 +0000 (20:44 +0100)]
lavfi: let gcc realign the stack on public graph driving functions

The functions which actually drive the filter graph by pushing
frames through it need to ensure an aligned stack for SIMD functions.

This fixes a crash in YADIF filter when using a mingw build in a MSVC application.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/delogo: 10l forgotten trailing NULL in shorthand.
Clément Bœsch [Sat, 16 Mar 2013 22:37:58 +0000 (23:37 +0100)]
lavfi/delogo: 10l forgotten trailing NULL in shorthand.

Regression since de3e0ab3.

7 years agoyadif: remove an 'm' from the LOAD macro definition
James Darnley [Sat, 16 Mar 2013 20:42:27 +0000 (21:42 +0100)]
yadif: remove an 'm' from the LOAD macro definition

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoyadif: remove repeated check on width
James Darnley [Sat, 16 Mar 2013 20:42:26 +0000 (21:42 +0100)]
yadif: remove repeated check on width

The filter already checks that width (and height) are greater than 3.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoyadif: cosmetic indentation from previous commits
James Darnley [Sat, 16 Mar 2013 20:42:25 +0000 (21:42 +0100)]
yadif: cosmetic indentation from previous commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoyadif: x86 assembly for 9 to 14-bit samples
James Darnley [Sat, 16 Mar 2013 20:42:24 +0000 (21:42 +0100)]
yadif: x86 assembly for 9 to 14-bit samples

These smaller samples do not need to be unpacked to double words
allowing the code to process more pixels every iteration (still 2 in MMX
but 6 in SSE2).  It also avoids emulating the missing double word
instructions on older instruction sets.

Like with the previous code for 16-bit samples this has been tested on
an Athlon64 and a Core2Quad.

Athlon64:
1809275 decicycles in C,    32718 runs, 50 skips
 911675 decicycles in mmx,  32727 runs, 41 skips, 2.0x faster
 495284 decicycles in sse2, 32747 runs, 21 skips, 3.7x faster

Core2Quad:
 921363 decicycles in C,     32756 runs, 12 skips
 486537 decicycles in mmx,   32764 runs,  4 skips, 1.9x faster
 293296 decicycles in sse2,  32759 runs,  9 skips, 3.1x faster
 284910 decicycles in ssse3, 32759 runs,  9 skips, 3.2x faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoyadif: x86 assembly for 16-bit samples
James Darnley [Sat, 16 Mar 2013 20:42:23 +0000 (21:42 +0100)]
yadif: x86 assembly for 16-bit samples

This is a fairly dumb copy of the assembly for 8-bit samples but it
works and produces identical output to the C version.  The options have
been tested on an Athlon64 and a Core2Quad.

Athlon64:
1810385 decicycles in C,    32726 runs, 42 skips
1080744 decicycles in mmx,  32744 runs, 24 skips, 1.7x faster
 818315 decicycles in sse2, 32735 runs, 33 skips, 2.2x faster

Core2Quad:
 924025 decicycles in C,     32750 runs, 18 skips
 623995 decicycles in mmx,   32767 runs,  1 skips, 1.5x faster
 406223 decicycles in sse2,  32764 runs,  4 skips, 2.3x faster
 387842 decicycles in ssse3, 32767 runs,  1 skips, 2.4x faster
 307726 decicycles in sse4,  32763 runs,  5 skips, 3.0x faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoDo not (re-)set libx264 parameter b_tff if interlaced encoding was not requested.
Carl Eugen Hoyos [Sat, 16 Mar 2013 19:13:44 +0000 (20:13 +0100)]
Do not (re-)set libx264 parameter b_tff if interlaced encoding was not requested.

Reconfiguring can break x264 lossless encoding.

Fixes ticket #2165.

7 years agoffmpeg_opt: add OPT_INPUT to -fix_sub_duration and -canvas_size.
Nicolas George [Sat, 16 Mar 2013 10:05:45 +0000 (11:05 +0100)]
ffmpeg_opt: add OPT_INPUT to -fix_sub_duration and -canvas_size.

7 years agolavfi/avcodec: deprecate remainders of the avcodec glue code
Hendrik Leppkes [Wed, 13 Mar 2013 20:01:27 +0000 (21:01 +0100)]
lavfi/avcodec: deprecate remainders of the avcodec glue code

Since lavfi works natively with AVFrame now, these functions are no longer
necessary and can be removed in a future bump.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoappend_packet_chunked: Remove unused initialization.
Michael Niedermayer [Sat, 16 Mar 2013 16:03:41 +0000 (17:03 +0100)]
append_packet_chunked: Remove unused initialization.

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

* qatar/master:
  af_join: do not leak input frames.
  asrc_anullsrc: return EOF, not -1

Conflicts:
libavfilter/asrc_anullsrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'f4281f457194a6a4489fbd7423e2ab2e13c6d4d9'
Michael Niedermayer [Sat, 16 Mar 2013 15:56:30 +0000 (16:56 +0100)]
Merge commit 'f4281f457194a6a4489fbd7423e2ab2e13c6d4d9'

* commit 'f4281f457194a6a4489fbd7423e2ab2e13c6d4d9':
  asrc_anullsrc: do not set samplerate and channel layout explicitly

Conflicts:
libavfilter/asrc_anullsrc.c

No change to FFmpeg due to semantic difference between the filter sources

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b'
Michael Niedermayer [Sat, 16 Mar 2013 15:38:11 +0000 (16:38 +0100)]
Merge commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b'

* commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b':
  vf_showinfo: remove its useless init function
  AVOptions: fix using named constants with child contexts.

Conflicts:
libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '9676b9a2cdc4a90611188fc48d8d388e427997c5'
Michael Niedermayer [Sat, 16 Mar 2013 15:27:47 +0000 (16:27 +0100)]
Merge commit '9676b9a2cdc4a90611188fc48d8d388e427997c5'

* commit '9676b9a2cdc4a90611188fc48d8d388e427997c5':
  AVOption: remove an unused function parameter.
  filters.texi: restore mistakenly removed section name for noformat
  avfiltergraph: use sizeof(var) instead of sizeof(type)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: test both direct and indirect paths in delogo filter.
Clément Bœsch [Sat, 16 Mar 2013 15:22:56 +0000 (16:22 +0100)]
fate: test both direct and indirect paths in delogo filter.

7 years agofate: test both direct and indirect paths in hue filter.
Clément Bœsch [Sat, 16 Mar 2013 15:17:37 +0000 (16:17 +0100)]
fate: test both direct and indirect paths in hue filter.

7 years agoMerge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf'
Michael Niedermayer [Sat, 16 Mar 2013 15:09:37 +0000 (16:09 +0100)]
Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf'

* commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf':
  avfiltergraph: replace AVFilterGraph.filter_count with nb_filters

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: test both direct and indirect paths in hqdn3d and gradfun.
Clément Bœsch [Thu, 14 Mar 2013 20:59:42 +0000 (21:59 +0100)]
fate: test both direct and indirect paths in hqdn3d and gradfun.

7 years agolavfi: add perms and aperms filters.
Clément Bœsch [Wed, 13 Mar 2013 04:59:20 +0000 (05:59 +0100)]
lavfi: add perms and aperms filters.

7 years agoMerge commit '556aab8f11b045a21182eee32413aa78d5c8539b'
Michael Niedermayer [Sat, 16 Mar 2013 14:50:43 +0000 (15:50 +0100)]
Merge commit '556aab8f11b045a21182eee32413aa78d5c8539b'

* commit '556aab8f11b045a21182eee32413aa78d5c8539b':
  lavfi: use designated initializers in avfilter_class

Conflicts:
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'aa3c77998404cc32233cb76e961ca27db8565459'
Michael Niedermayer [Sat, 16 Mar 2013 14:12:21 +0000 (15:12 +0100)]
Merge commit 'aa3c77998404cc32233cb76e961ca27db8565459'

* commit 'aa3c77998404cc32233cb76e961ca27db8565459':
  lavf: sanity check size in av_get/append_packet().

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6'
Michael Niedermayer [Sat, 16 Mar 2013 13:10:09 +0000 (14:10 +0100)]
Merge commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6'

* commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6':
  lzo: fix overflow checking in copy_backptr()
  flacdec: simplify bounds checking in flac_probe()
  atrac3: avoid oversized shifting in decode_bytes()

Conflicts:
libavformat/flacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAdd raw VC-1 muxer to match demuxer.
Reimar Döffinger [Sun, 9 Dec 2012 12:17:52 +0000 (13:17 +0100)]
Add raw VC-1 muxer to match demuxer.

This is admittedly kind of pointless since usually -f image2pipe
can be used for the purpose, but this is more user-friendly.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agovc1testenc: give muxer same name as demuxer
Reimar Döffinger [Sun, 9 Dec 2012 12:11:58 +0000 (13:11 +0100)]
vc1testenc: give muxer same name as demuxer

Otherwise ffmpeg -formats claims that we only support demuxing
of that format.
To keep compatibility the struct could be duplicated instead,
but this seems almost like overkill for such a rare format.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoMake ff_win32_open more robust.
Reimar Döffinger [Sun, 10 Mar 2013 19:03:19 +0000 (20:03 +0100)]
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: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agompeg12: reduce hwaccel-related code duplication.
Reimar Döffinger [Sun, 24 Feb 2013 16:21:53 +0000 (17:21 +0100)]
mpeg12: reduce hwaccel-related code duplication.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoaf_join: do not leak input frames.
Anton Khirnov [Wed, 13 Mar 2013 19:43:35 +0000 (20:43 +0100)]
af_join: do not leak input frames.

7 years agoasrc_anullsrc: return EOF, not -1
Anton Khirnov [Tue, 12 Mar 2013 19:17:32 +0000 (20:17 +0100)]
asrc_anullsrc: return EOF, not -1

7 years agoasrc_anullsrc: do not set samplerate and channel layout explicitly
Anton Khirnov [Tue, 12 Mar 2013 19:14:29 +0000 (20:14 +0100)]
asrc_anullsrc: do not set samplerate and channel layout explicitly

They are auto-negotiated.

7 years agovf_showinfo: remove its useless init function
Anton Khirnov [Tue, 12 Mar 2013 18:45:56 +0000 (19:45 +0100)]
vf_showinfo: remove its useless init function

Filter private data is memset to 0 so there is no point in explicitly
initing anything to 0.

7 years agoAVOptions: fix using named constants with child contexts.
Anton Khirnov [Tue, 12 Mar 2013 17:21:27 +0000 (18:21 +0100)]
AVOptions: fix using named constants with child contexts.

The named constant needs to be searched for in the same object on which
the option is set, i.e. target_obj.

7 years agoAVOption: remove an unused function parameter.
Anton Khirnov [Tue, 12 Mar 2013 17:09:48 +0000 (18:09 +0100)]
AVOption: remove an unused function parameter.

7 years agofilters.texi: restore mistakenly removed section name for noformat
Anton Khirnov [Mon, 25 Feb 2013 22:01:11 +0000 (23:01 +0100)]
filters.texi: restore mistakenly removed section name for noformat

7 years agoavfiltergraph: use sizeof(var) instead of sizeof(type)
Anton Khirnov [Mon, 25 Feb 2013 11:14:56 +0000 (12:14 +0100)]
avfiltergraph: use sizeof(var) instead of sizeof(type)

7 years agoavfiltergraph: replace AVFilterGraph.filter_count with nb_filters
Anton Khirnov [Mon, 25 Feb 2013 11:12:36 +0000 (12:12 +0100)]
avfiltergraph: replace AVFilterGraph.filter_count with nb_filters

This is more consistent with the naming in the rest of Libav.

7 years agolavfi: use designated initializers in avfilter_class
Anton Khirnov [Mon, 25 Feb 2013 11:09:01 +0000 (12:09 +0100)]
lavfi: use designated initializers in avfilter_class

7 years agochangelog: add support for Monkey's Audio versions from 3.93
Compn [Sat, 16 Mar 2013 03:41:03 +0000 (23:41 -0400)]
changelog: add support for Monkey's Audio versions from 3.93

7 years agolavd/v4l2: silence libv4l2 logging
Giorgio Vazzana [Fri, 8 Mar 2013 12:03:43 +0000 (13:03 +0100)]
lavd/v4l2: silence libv4l2 logging

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodpxenc: fix data offset
ArnoB [Thu, 14 Mar 2013 17:35:55 +0000 (18:35 +0100)]
dpxenc: fix data offset

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavd/lavfi: upgrade to AVFrame.
Nicolas George [Tue, 12 Mar 2013 13:21:27 +0000 (14:21 +0100)]
lavd/lavfi: upgrade to AVFrame.

Fix a memory leak because the compat implementation of
AV_BUFFERSINK_FLAG_PEEK is not identical to the previous one.

7 years agolavf: sanity check size in av_get/append_packet().
Anton Khirnov [Tue, 19 Feb 2013 16:20:35 +0000 (17:20 +0100)]
lavf: sanity check size in av_get/append_packet().

To avoid allocating ridiculous amounts of memory for corrupted files,
read the input in chunks limited to filesize or an arbitrary large
amount when that is not known (chosen to be 50M).

7 years agolavc & lavf: replace deprecated av_log* functions
Paul B Mahol [Fri, 15 Mar 2013 17:13:52 +0000 (17:13 +0000)]
lavc & lavf: replace deprecated av_log* functions

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoyadif: correct strides in filter_edges_16bit
James Darnley [Fri, 15 Mar 2013 15:37:33 +0000 (16:37 +0100)]
yadif: correct strides in filter_edges_16bit

The C code treats the data as arrays of uint16_t so strides must not
be in bytes but in pixels.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter: avoid direct access to AVFrame.channels
Michael Niedermayer [Fri, 15 Mar 2013 15:13:53 +0000 (16:13 +0100)]
avfilter: avoid direct access to AVFrame.channels

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegvideo: Fix exported qp table offest
Michael Niedermayer [Fri, 15 Mar 2013 13:33:24 +0000 (14:33 +0100)]
mpegvideo: Fix exported qp table offest

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomatroskadec: avoid integer overflow
Michael Niedermayer [Fri, 15 Mar 2013 12:48:04 +0000 (13:48 +0100)]
matroskadec: avoid integer overflow

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 15 Mar 2013 12:42:56 +0000 (13:42 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  add support for Monkey's Audio versions from 3.93

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '9652d4fcfc9c07a726b35efc4ac644d9751b36d7'
Michael Niedermayer [Fri, 15 Mar 2013 12:34:14 +0000 (13:34 +0100)]
Merge commit '9652d4fcfc9c07a726b35efc4ac644d9751b36d7'

* commit '9652d4fcfc9c07a726b35efc4ac644d9751b36d7':
  ape: provide two additional bytes in buffer for old MAC versions

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

* commit 'b164d66e35d349de414e2f0d7365a147aba8a620':
  ape: make version-dependent decoding functions called via pointers
  mpegts: add support for stream_type 0x42, which is CAVS

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '3e175a2a550f5c2f788e8cd969052e10a5025a27'
Michael Niedermayer [Fri, 15 Mar 2013 11:34:11 +0000 (12:34 +0100)]
Merge commit '3e175a2a550f5c2f788e8cd969052e10a5025a27'

* commit '3e175a2a550f5c2f788e8cd969052e10a5025a27':
  avconv: mark attachment streams as immediately finished
  vaapi: fix argument for ff_vaapi_common_end_frame call

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolzo: fix overflow checking in copy_backptr()
Xi Wang [Fri, 15 Mar 2013 10:59:22 +0000 (06:59 -0400)]
lzo: fix overflow checking in copy_backptr()

The check `src > dst' in the form `&c->out[-back] > c->out' invokes
pointer overflow, which is undefined behavior in C.

Remove the check.  Also replace `&c->out[-back] < c->out_start' with
a safe form `c->out - c->out_start < back' to avoid overflow.

CC: libav-stable@libav.org
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agoflacdec: simplify bounds checking in flac_probe()
Xi Wang [Fri, 15 Mar 2013 11:11:47 +0000 (07:11 -0400)]
flacdec: simplify bounds checking in flac_probe()

Simplify `p->buf > p->buf + p->buf_size - 4' as `p->buf_size < 4'.
Avoid a possible out-of-bounds pointer, which is undefined behavior
in C.

CC: libav-stable@libav.org
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agoatrac3: avoid oversized shifting in decode_bytes()
Xi Wang [Fri, 15 Mar 2013 10:31:21 +0000 (06:31 -0400)]
atrac3: avoid oversized shifting in decode_bytes()

When `off' is 0, `0x537F6103 << 32' in the following expression invokes
undefined behavior, the result of which is not necessarily 0.

    (0x537F6103 >> (off * 8)) | (0x537F6103 << (32 - (off * 8)))

Avoid oversized shifting.

CC: libav-stable@libav.org
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agoadd support for Monkey's Audio versions from 3.93
Kostya Shishkov [Tue, 12 Mar 2013 18:33:29 +0000 (19:33 +0100)]
add support for Monkey's Audio versions from 3.93

7 years agoape: provide two additional bytes in buffer for old MAC versions
Kostya Shishkov [Tue, 12 Mar 2013 06:17:03 +0000 (07:17 +0100)]
ape: provide two additional bytes in buffer for old MAC versions

Range coder in 3.90-3.95 overread two bytes in the final normalize.

7 years agoape: make version-dependent decoding functions called via pointers
Kostya Shishkov [Tue, 12 Mar 2013 06:33:12 +0000 (07:33 +0100)]
ape: make version-dependent decoding functions called via pointers

This will help in supporting old versions, e.g. version 3.93 uses the same
range coder but different predictor and version 3.82 uses different range
coder and predictor. Also this should not make decoding newer versions slower
by introducing additional checks on versions.

7 years agompegts: add support for stream_type 0x42, which is CAVS
Can Wu [Tue, 26 Feb 2013 02:01:21 +0000 (10:01 +0800)]
mpegts: add support for stream_type 0x42, which is CAVS

This allows demuxing and muxing of CAVS TS streams.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoavconv: mark attachment streams as immediately finished
Anton Khirnov [Thu, 14 Mar 2013 08:44:07 +0000 (09:44 +0100)]
avconv: mark attachment streams as immediately finished

There are never any packets for those streams.
Fixes an infinite loop with -attach.

7 years agodsputil: remove non-8bpp draw_edge.
Ronald S. Bultje [Thu, 14 Mar 2013 17:01:52 +0000 (10:01 -0700)]
dsputil: remove non-8bpp draw_edge.

It is never used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorv34: export qp table
Michael Niedermayer [Fri, 15 Mar 2013 02:19:54 +0000 (03:19 +0100)]
rv34: export qp table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorv10: export qp table
Michael Niedermayer [Fri, 15 Mar 2013 02:16:23 +0000 (03:16 +0100)]
rv10: export qp table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_pp: use new API to access qp table
Michael Niedermayer [Thu, 14 Mar 2013 01:14:31 +0000 (02:14 +0100)]
vf_pp: use new API to access qp table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg1/2: export qp table
Michael Niedermayer [Thu, 14 Mar 2013 01:14:06 +0000 (02:14 +0100)]
mpeg1/2: export qp table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomjpegdec: export qp table
Michael Niedermayer [Thu, 14 Mar 2013 01:13:39 +0000 (02:13 +0100)]
mjpegdec: export qp table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh263dec: export qp_table
Michael Niedermayer [Thu, 14 Mar 2013 01:13:08 +0000 (02:13 +0100)]
h263dec: export qp_table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil/frame: add AVBufferRef for qp table
Michael Niedermayer [Thu, 14 Mar 2013 01:12:14 +0000 (02:12 +0100)]
avutil/frame: add AVBufferRef for qp table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/ebur128: check histogram allocations.
Clément Bœsch [Fri, 15 Mar 2013 01:58:29 +0000 (02:58 +0100)]
lavfi/ebur128: check histogram allocations.

7 years agolavfi/ebur128: add framelog option.
Clément Bœsch [Fri, 15 Mar 2013 01:32:25 +0000 (02:32 +0100)]
lavfi/ebur128: add framelog option.

7 years agolavf/avio: fix two extreemly unreasonble typos.
Clément Bœsch [Thu, 14 Mar 2013 22:36:30 +0000 (23:36 +0100)]
lavf/avio: fix two extreemly unreasonble typos.

7 years agoexamples/filtering_*: constify AVFrame * for print_frame() and display_frame() functions
Stefano Sabatini [Thu, 14 Mar 2013 20:38:07 +0000 (21:38 +0100)]
examples/filtering_*: constify AVFrame * for print_frame() and display_frame() functions

7 years agoexamples/filtering_audio: update to new API
Stefano Sabatini [Wed, 13 Mar 2013 21:08:33 +0000 (22:08 +0100)]
examples/filtering_audio: update to new API

In particular, fix crash.

7 years agoexamples/filtering_video: update to new API
Stefano Sabatini [Wed, 13 Mar 2013 20:56:14 +0000 (21:56 +0100)]
examples/filtering_video: update to new API

In particular, fix crash.

7 years agolavfi/graphdump: fix output for unknown layouts.
Nicolas George [Thu, 14 Mar 2013 19:13:13 +0000 (20:13 +0100)]
lavfi/graphdump: fix output for unknown layouts.

7 years agoffmpeg: add OPT_INPUT to -guess_layout_max.
Nicolas George [Thu, 14 Mar 2013 18:19:38 +0000 (19:19 +0100)]
ffmpeg: add OPT_INPUT to -guess_layout_max.

7 years agoffmpeg: add OPT_OUTPUT to -to option.
Nicolas George [Thu, 14 Mar 2013 18:18:51 +0000 (19:18 +0100)]
ffmpeg: add OPT_OUTPUT to -to option.

Fix trac ticket #2355.

7 years agolavfi/ebur128: use same ref for inputs and outputs.
Clément Bœsch [Thu, 14 Mar 2013 13:36:32 +0000 (14:36 +0100)]
lavfi/ebur128: use same ref for inputs and outputs.

Fixes Ticket2342.

7 years agomjpegdec: fix indention
Michael Niedermayer [Thu, 14 Mar 2013 16:31:14 +0000 (17:31 +0100)]
mjpegdec: fix indention

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojpegdec: be less picky on padding
Michael Niedermayer [Thu, 14 Mar 2013 16:20:44 +0000 (17:20 +0100)]
jpegdec: be less picky on padding

Fixes Ticket2353

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovaapi: fix argument for ff_vaapi_common_end_frame call
Janne Grunau [Thu, 14 Mar 2013 14:12:30 +0000 (15:12 +0100)]
vaapi: fix argument for ff_vaapi_common_end_frame call

7 years agolavc: make compilation of frame_thread_encoder.o optional.
Ronald S. Bultje [Thu, 14 Mar 2013 04:59:33 +0000 (21:59 -0700)]
lavc: make compilation of frame_thread_encoder.o optional.

Only compile if CONFIG_ENCODERS is enabled, i.e. if at least one
encoder is to be compiled. This prevents it from being includes in
a decoder-only build.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodsputil: remove duplicate or unused functions.
Ronald S. Bultje [Thu, 14 Mar 2013 13:44:18 +0000 (06:44 -0700)]
dsputil: remove duplicate or unused functions.

dct_bits is never set except in h264, where it is never used, thus
remove it. Then, remove all functions that were set based on non-zero
(32) values for dct_bits. Lastly, merge 9-14 bpp functions for get_pixels
and draw_edge, which only care about pixel storage unit size, not actual
bits used (i.e. they don't clip).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodsputil: unbreak compilation on sparc after 6802c70
Hendrik Leppkes [Thu, 14 Mar 2013 11:21:43 +0000 (12:21 +0100)]
dsputil: unbreak compilation on sparc after 6802c70

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMAINTAINERS: mention that people are welcome to pick up and maintain older releases
Michael Niedermayer [Thu, 14 Mar 2013 13:50:42 +0000 (14:50 +0100)]
MAINTAINERS: mention that people are welcome to pick up and maintain older releases

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavdevice: bump major
Michael Niedermayer [Thu, 14 Mar 2013 12:31:38 +0000 (13:31 +0100)]
avdevice: bump major

Our previous release (1.1) contained a version 54 libavdevice
and this version here is not ABI compatible thus a bump is
needed

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

* qatar/master:
  avcodec: av_log_missing_feature(1) ---> avpriv_request_sample()

Conflicts:
libavcodec/aacsbr.c
libavcodec/amrnbdec.c
libavcodec/takdec.c
libavcodec/tta.c

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

* commit '6d97484d72e33f7dde9493a9ead1a72e2f029605':
  avcodec: av_log_ask_for_sample() ---> avpriv_request_sample()
  rsodec: Use avpriv_report_missing_feature() where appropriate

Conflicts:
libavcodec/anm.c
libavcodec/mlpdec.c
libavcodec/pictordec.c
libavcodec/sunrast.c

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

* commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e':
  avformat: av_log_ask_for_sample() ---> avpriv_request_sample()

Conflicts:
libavformat/mxfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '63d744e2be39466e3a734c2987cd713e0bac101e'
Michael Niedermayer [Thu, 14 Mar 2013 11:30:19 +0000 (12:30 +0100)]
Merge commit '63d744e2be39466e3a734c2987cd713e0bac101e'

* commit '63d744e2be39466e3a734c2987cd713e0bac101e':
  av_log_missing_feature() ---> avpriv_report_missing_feature()

Conflicts:
libavcodec/aacdec.c
libavcodec/tta.c
libavformat/mpegts.c

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

* commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8':
  Add av_log_{ask_for_sample|missing_feature} replacements to libavutil
  ismindex: Check the return value of allocations

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

* commit '7c147900b86c0f1cf030b7b844c670649c80c191':
  ismindex: Factorize code for printing chunk duration lists

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

* commit 'f05e9beb4ab5fb8b9d5ba81405e9fca901832591':
  ismindex: Rename structs and fields from "file" to "track"
  avpacket: copy side data type and size in av_dup_packet

Conflicts:
libavcodec/avpacket.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: do not set coded_frame->reference
Paul B Mahol [Thu, 14 Mar 2013 09:45:40 +0000 (09:45 +0000)]
lavc: do not set coded_frame->reference

That field is deprecated.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoRevert "lavfi/ebur128: fix format negociation for output."
Clément Bœsch [Thu, 14 Mar 2013 05:25:20 +0000 (06:25 +0100)]
Revert "lavfi/ebur128: fix format negociation for output."

This reverts commit 9efcfbed9dd64679145f5f39d9a812dfeea97172.

All the shame on me; this commit is actually causing more problems
(broken outputs but also crashes) than it was solving.

7 years agolavfi/ebur128: fix format negociation for output.
Clément Bœsch [Wed, 13 Mar 2013 23:56:20 +0000 (00:56 +0100)]
lavfi/ebur128: fix format negociation for output.

Before this change, the audio input and output formats are set
independently, so the lavfi negociation could pick different settings
for the input and output. This is particularly true for the channel
layout settings, where multiple choices were available.

Fixes Ticket2342.

7 years agolavfi/thumbnail: support flushing.
Clément Bœsch [Wed, 13 Mar 2013 22:59:25 +0000 (23:59 +0100)]
lavfi/thumbnail: support flushing.

This makes possible the raise of one picture if the input has less than
the number of frames to analyze.

Fixes Ticket1992.

7 years agolavfi/avcodec: fix API version checks
Hendrik Leppkes [Wed, 13 Mar 2013 20:01:26 +0000 (21:01 +0100)]
lavfi/avcodec: fix API version checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/avcodec: cleanup includes
Hendrik Leppkes [Wed, 13 Mar 2013 20:01:25 +0000 (21:01 +0100)]
lavfi/avcodec: cleanup includes

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