ffmpeg.git
6 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>
6 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.

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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

6 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.

6 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.

6 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>
6 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.

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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.

6 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.

6 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.

6 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

6 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.

6 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.

6 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.

6 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.

6 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.

6 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.

6 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>
6 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>
6 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

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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.

6 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.

6 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.

6 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>
6 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>
6 years agotiff: fix handling of metadata with refcounted frames
Hendrik Leppkes [Wed, 13 Mar 2013 17:51:17 +0000 (18:51 +0100)]
tiff: fix handling of metadata with refcounted frames

Since the conversion to refcounted frames, the tiff decoder
only wrote the metadata into its internal "picture" in its own context,
never exposing the metadata to the user, and eventually leaking the
metadata.

Instead, properly store the metadata directly into the frame being decoded into.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoyadif: restore speed of the C filtering code
James Darnley [Sun, 10 Mar 2013 14:08:50 +0000 (15:08 +0100)]
yadif: restore speed of the C filtering code

Always use the special filter for the first and last 3 columns (only).

Changes made in 64ed397 slowed the filter to just under 3/4 of what it
was.  This commit restores the speed while maintaining identical output.

For reference, on my Athlon64:
1733222 decicycles in old
2358563 decicycles in new
1727558 decicycles in this

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: av_log_missing_feature(1) ---> avpriv_request_sample()
Diego Biurrun [Wed, 13 Mar 2013 20:18:34 +0000 (21:18 +0100)]
avcodec: av_log_missing_feature(1) ---> avpriv_request_sample()

6 years agoavcodec: av_log_ask_for_sample() ---> avpriv_request_sample()
Diego Biurrun [Wed, 13 Mar 2013 20:17:05 +0000 (21:17 +0100)]
avcodec: av_log_ask_for_sample() ---> avpriv_request_sample()

6 years agorsodec: Use avpriv_report_missing_feature() where appropriate
Diego Biurrun [Sat, 9 Mar 2013 22:15:41 +0000 (23:15 +0100)]
rsodec: Use avpriv_report_missing_feature() where appropriate

6 years agoavformat: av_log_ask_for_sample() ---> avpriv_request_sample()
Diego Biurrun [Mon, 25 Feb 2013 22:54:28 +0000 (23:54 +0100)]
avformat: av_log_ask_for_sample() ---> avpriv_request_sample()

6 years agoav_log_missing_feature() ---> avpriv_report_missing_feature()
Diego Biurrun [Mon, 25 Feb 2013 22:53:52 +0000 (23:53 +0100)]
av_log_missing_feature() ---> avpriv_report_missing_feature()

6 years agoAdd av_log_{ask_for_sample|missing_feature} replacements to libavutil
Diego Biurrun [Tue, 22 Jan 2013 01:41:54 +0000 (02:41 +0100)]
Add av_log_{ask_for_sample|missing_feature} replacements to libavutil

This allows reporting missing features and requesting samples from
all libraries in a standard way; with a simplified API.

6 years agolavfi/cropdetect: add support for named options
Stefano Sabatini [Wed, 13 Mar 2013 00:13:04 +0000 (01:13 +0100)]
lavfi/cropdetect: add support for named options

6 years agolavu/frame: free frame metadata when unrefing a frame.
Hendrik Leppkes [Wed, 13 Mar 2013 16:51:07 +0000 (17:51 +0100)]
lavu/frame: free frame metadata when unrefing a frame.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: remove AVCodecContext->metadata
Hendrik Leppkes [Wed, 13 Mar 2013 16:51:06 +0000 (17:51 +0100)]
avcodec: remove AVCodecContext->metadata

This field was only ever set and freed from avcodec, and not otherwise
used. However, because frames are refcounted now, avcodec cannot make any
assumptions about the lifetime of the frame metadata, which can result in
double-frees or leaked memory.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoismindex: Check the return value of allocations
Martin Storsjö [Wed, 13 Mar 2013 12:13:46 +0000 (14:13 +0200)]
ismindex: Check the return value of allocations

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoismindex: Factorize code for printing chunk duration lists
Martin Storsjö [Wed, 13 Mar 2013 10:29:43 +0000 (12:29 +0200)]
ismindex: Factorize code for printing chunk duration lists

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoismindex: Rename structs and fields from "file" to "track"
Martin Storsjö [Wed, 13 Mar 2013 09:42:34 +0000 (11:42 +0200)]
ismindex: Rename structs and fields from "file" to "track"

The tool nowadays supports more than one track per file,
this makes reading the code slightly less confusing.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavfi/delogo: remove sscanf and rely on av_opt_set_from_string() only.
Clément Bœsch [Wed, 13 Mar 2013 03:21:53 +0000 (04:21 +0100)]
lavfi/delogo: remove sscanf and rely on av_opt_set_from_string() only.

6 years agolavc/crystalhd: remove now unecessary buffer_hints.
Clément Bœsch [Wed, 13 Mar 2013 17:56:34 +0000 (18:56 +0100)]
lavc/crystalhd: remove now unecessary buffer_hints.

6 years agolavc: factorize ff_{thread_,re,}get_buffer error messages.
Clément Bœsch [Tue, 12 Mar 2013 07:41:53 +0000 (08:41 +0100)]
lavc: factorize ff_{thread_,re,}get_buffer error messages.

Coccinelle profile used:

  @@
  expression r, ctx, f, loglevel, str, flags;
  @@

  -if ((r = ff_get_buffer(ctx, f, flags)) < 0) {
  -    av_log(ctx, loglevel, str);
  -    return r;
  -}
  +if ((r = ff_get_buffer(ctx, f, flags)) < 0)
  +    return r;

  @@
  expression r, ctx, f, loglevel, str;
  @@

  -if ((r = ff_reget_buffer(ctx, f)) < 0) {
  -    av_log(ctx, loglevel, str);
  -    return r;
  -}
  +if ((r = ff_reget_buffer(ctx, f)) < 0)
  +    return r;

  @@
  expression r, ctx, f, loglevel, str, flags;
  @@

  -if ((r = ff_thread_get_buffer(ctx, f, flags)) < 0) {
  -    av_log(ctx, loglevel, str);
  -    return r;
  -}
  +if ((r = ff_thread_get_buffer(ctx, f, flags)) < 0)
  +    return r;

...along with some manual patches for the remaining ones.

6 years agolavfi/thumbnail: remove unecessary poll_frame() callback.
Clément Bœsch [Wed, 13 Mar 2013 09:23:14 +0000 (10:23 +0100)]
lavfi/thumbnail: remove unecessary poll_frame() callback.

6 years agolavfi/mptestsrc: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:57:31 +0000 (09:57 +0100)]
lavfi/mptestsrc: raise filter_frame() error.

6 years agolavfi/mandelbrot: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:57:18 +0000 (09:57 +0100)]
lavfi/mandelbrot: raise filter_frame() error.

6 years agolavfi/life: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:57:11 +0000 (09:57 +0100)]
lavfi/life: raise filter_frame() error.

6 years agolavfi/cellauto: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:57:05 +0000 (09:57 +0100)]
lavfi/cellauto: raise filter_frame() error.

6 years agolavfi/alphamerge: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:56:58 +0000 (09:56 +0100)]
lavfi/alphamerge: raise filter_frame() error.

6 years agolavfi/movie: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:56:50 +0000 (09:56 +0100)]
lavfi/movie: raise filter_frame() error.

6 years agolavfi/buffersrc: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:56:42 +0000 (09:56 +0100)]
lavfi/buffersrc: raise filter_frame() error.

6 years agolavfi/showspectrum: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:56:35 +0000 (09:56 +0100)]
lavfi/showspectrum: raise filter_frame() error.

6 years agolavfi/avfilter: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:56:26 +0000 (09:56 +0100)]
lavfi/avfilter: raise filter_frame() error.

6 years agolavfi/concat: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:56:18 +0000 (09:56 +0100)]
lavfi/concat: raise filter_frame() error.

6 years agolavfi/anullsrc: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:56:09 +0000 (09:56 +0100)]
lavfi/anullsrc: raise filter_frame() error.

6 years agolavfi/aevalsrc: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:55:56 +0000 (09:55 +0100)]
lavfi/aevalsrc: raise filter_frame() error.

6 years agolavfi/atempo: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:55:43 +0000 (09:55 +0100)]
lavfi/atempo: raise filter_frame() error.

6 years agolavfi/asetnsamples: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:55:32 +0000 (09:55 +0100)]
lavfi/asetnsamples: raise filter_frame() error.

6 years agolavfi/aresample: raise filter_frame() error.
Clément Bœsch [Wed, 13 Mar 2013 08:55:18 +0000 (09:55 +0100)]
lavfi/aresample: raise filter_frame() error.

6 years agolavu/frame: av_frame_make_writable: set the channels on the new frame.
Hendrik Leppkes [Wed, 13 Mar 2013 12:44:55 +0000 (13:44 +0100)]
lavu/frame: av_frame_make_writable: set the channels on the new frame.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/frame: copy all frame properties in av_frame_copy_props
Hendrik Leppkes [Wed, 13 Mar 2013 12:41:21 +0000 (13:41 +0100)]
lavu/frame: copy all frame properties in av_frame_copy_props

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodsputil: remove deprecated dsp_mask usage
Hendrik Leppkes [Wed, 13 Mar 2013 12:20:43 +0000 (13:20 +0100)]
dsputil: remove deprecated dsp_mask usage

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodsputil_mmx: remove unused variables
Michael Niedermayer [Wed, 13 Mar 2013 14:07:46 +0000 (15:07 +0100)]
dsputil_mmx: remove unused variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoexr: silence warning "libavcodec/exr.c:351:9: warning: variable ret set but not used"
Michael Niedermayer [Wed, 13 Mar 2013 13:56:22 +0000 (14:56 +0100)]
exr: silence warning "libavcodec/exr.c:351:9: warning: variable ret set but not used"

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

* qatar/master:
  hqdn3d: Fix out of array read in LOWPASS
  cabac: remove unused argument of ff_init_cabac_states()
  rawdec: fix a typo -- || instead of |

Conflicts:
libavcodec/cabac.c
libavcodec/h264.c
libavfilter/vf_hqdn3d.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '37cb3b180a1dc3d6f123f68e0806585ebc2578b6'
Michael Niedermayer [Wed, 13 Mar 2013 13:41:18 +0000 (14:41 +0100)]
Merge commit '37cb3b180a1dc3d6f123f68e0806585ebc2578b6'

* commit '37cb3b180a1dc3d6f123f68e0806585ebc2578b6':
  matroskadec: request a read buffer for the wav header

See: d0b450457b3aeb8c234b0b0a987db55d3485326b

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1: fix int/ptrdiff_t mismatches
Michael Niedermayer [Wed, 13 Mar 2013 13:31:39 +0000 (14:31 +0100)]
vc1: fix int/ptrdiff_t mismatches

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a8b6015823e628047a45916404c00044c5e80415'
Michael Niedermayer [Wed, 13 Mar 2013 13:18:53 +0000 (14:18 +0100)]
Merge commit 'a8b6015823e628047a45916404c00044c5e80415'

* commit 'a8b6015823e628047a45916404c00044c5e80415':
  dsputil: convert remaining functions to use ptrdiff_t strides

Conflicts:
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/h264qpel_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a4472ac01e86f9fae5adb9034f2777b86a9c5480'
Michael Niedermayer [Wed, 13 Mar 2013 13:03:22 +0000 (14:03 +0100)]
Merge commit 'a4472ac01e86f9fae5adb9034f2777b86a9c5480'

* commit 'a4472ac01e86f9fae5adb9034f2777b86a9c5480':
  Add informative messages to av_log_ask_for_sample calls lacking them
  anm: Get rid of some very silly goto statements

Conflicts:
libavformat/anm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '202c2acc40a6de8758b44ab3f5c85ab250079734'
Michael Niedermayer [Wed, 13 Mar 2013 12:53:02 +0000 (13:53 +0100)]
Merge commit '202c2acc40a6de8758b44ab3f5c85ab250079734'

* commit '202c2acc40a6de8758b44ab3f5c85ab250079734':
  vda: remove async decoder leftovers

Conflicts:
libavcodec/vda_h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a2816230c5c0a8fc72bc0163b7d21a96b194d87a'
Michael Niedermayer [Wed, 13 Mar 2013 12:45:50 +0000 (13:45 +0100)]
Merge commit 'a2816230c5c0a8fc72bc0163b7d21a96b194d87a'

* commit 'a2816230c5c0a8fc72bc0163b7d21a96b194d87a':
  avframe: call release_buffer only if it is set

Conflicts:
libavcodec/utils.c

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