ffmpeg.git
6 years agoffmpeg.c: count subtitles in total size.
Nicolas George [Sun, 17 Jun 2012 17:50:36 +0000 (19:50 +0200)]
ffmpeg.c: count subtitles in total size.

This avoids the "Output file is empty" warning
with subtitles-only files.

6 years agoffprobe: dump AVPacket.convergence_duration.
Nicolas George [Sun, 17 Jun 2012 15:16:48 +0000 (17:16 +0200)]
ffprobe: dump AVPacket.convergence_duration.

6 years agoffprobe: add -show_data option.
Nicolas George [Sat, 7 Apr 2012 17:18:09 +0000 (19:18 +0200)]
ffprobe: add -show_data option.

6 years agolavf: add field for how duration is estimated
Michael Bradshaw [Mon, 18 Jun 2012 05:20:09 +0000 (22:20 -0700)]
lavf: add field for how duration is estimated

Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
6 years agoFix interlaced prediction for RGB utvideo.
Carl Eugen Hoyos [Mon, 18 Jun 2012 07:01:35 +0000 (09:01 +0200)]
Fix interlaced prediction for RGB utvideo.

Fixes ticket #1215

6 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sun, 17 Jun 2012 21:42:52 +0000 (23:42 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: fix -vismv 1
  ffplay: rename buffer source instance from "src" to "ffplay_buffer"
  ffplay: use key=val syntax for the buffersrc args

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 17 Jun 2012 20:28:28 +0000 (22:28 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  amr: Cosmetic cleanup
  mov_chan: Fix operator precedence by adding parentheses
  doc: Add missing protocols to list of supported protocols.
  tcp: Check the listen call

Conflicts:
libavformat/amr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: fix -vismv 1
Michael Niedermayer [Sun, 17 Jun 2012 18:56:30 +0000 (20:56 +0200)]
ffplay: fix -vismv 1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: rename buffer source instance from "src" to "ffplay_buffer"
Stefano Sabatini [Sun, 17 Jun 2012 10:21:34 +0000 (12:21 +0200)]
ffplay: rename buffer source instance from "src" to "ffplay_buffer"

The new name is more descriptive.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: use key=val syntax for the buffersrc args
Stefano Sabatini [Sun, 17 Jun 2012 10:21:27 +0000 (12:21 +0200)]
ffplay: use key=val syntax for the buffersrc args

Fix warning:
[src @ ...] Flat options syntax is deprecated, use key=value pairs.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agovp3dec: fix null ptr derefernce.
Michael Niedermayer [Sun, 17 Jun 2012 17:50:58 +0000 (19:50 +0200)]
vp3dec: fix null ptr derefernce.

Fixes ticket1403

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoattributes: move av_restrict fallback from internal to attributes
Michael Niedermayer [Sun, 17 Jun 2012 16:01:11 +0000 (18:01 +0200)]
attributes: move av_restrict fallback from internal to attributes

This should fix --enable-hardcoded-tables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoamr: Cosmetic cleanup
Martin Storsjö [Sun, 17 Jun 2012 15:07:27 +0000 (18:07 +0300)]
amr: Cosmetic cleanup

Add spaces around operators, fix brace placement and whitespace to
match K&R style, vertically align code, remove redundant != 0 and
convert x == 0 into !x, drop useless braces.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agofate: fix fate-aac-aref-encode dependancies
Michael Niedermayer [Sun, 17 Jun 2012 15:59:00 +0000 (17:59 +0200)]
fate: fix fate-aac-aref-encode dependancies

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavienc: use av_assert
Michael Niedermayer [Sun, 17 Jun 2012 15:10:05 +0000 (17:10 +0200)]
avienc: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomsmpeg4enc: use av_assert
Michael Niedermayer [Sun, 17 Jun 2012 15:09:34 +0000 (17:09 +0200)]
msmpeg4enc: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomov_chan: Fix operator precedence by adding parentheses
Martin Storsjö [Sat, 16 Jun 2012 23:08:00 +0000 (02:08 +0300)]
mov_chan: Fix operator precedence by adding parentheses

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agodoc: Add missing protocols to list of supported protocols.
Diego Biurrun [Thu, 14 Jun 2012 08:34:16 +0000 (10:34 +0200)]
doc: Add missing protocols to list of supported protocols.

6 years agodoc: add two similar overlay "side-by-side" examples.
Clément Bœsch [Sun, 17 Jun 2012 11:16:02 +0000 (13:16 +0200)]
doc: add two similar overlay "side-by-side" examples.

6 years agolavfi: use designated initializers for AVClass
Paul B Mahol [Sat, 16 Jun 2012 12:34:36 +0000 (12:34 +0000)]
lavfi: use designated initializers for AVClass

While here:
    - add missing .version and .category,
    - make .class_name consistent across filters,
    - align declarations.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMAINTAINERS: reorganize entries in the libavfilter section
Stefano Sabatini [Sun, 17 Jun 2012 11:01:58 +0000 (13:01 +0200)]
MAINTAINERS: reorganize entries in the libavfilter section

6 years agointel h263 dec: support advanced prediction
Michael Niedermayer [Sun, 17 Jun 2012 19:12:20 +0000 (21:12 +0200)]
intel h263 dec: support advanced prediction

Fixes Ticket1292

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: add atempo filter
Pavel Koshevoy [Sun, 17 Jun 2012 10:35:57 +0000 (12:35 +0200)]
lavfi: add atempo filter

Add atempo audio filter for adjusting audio tempo without affecting
pitch. This filter implements WSOLA algorithm with fast cross
correlation calculation in frequency domain.

Signed-off-by: Pavel Koshevoy <pavel@homestead.aragog.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agotcp: Check the listen call
Jordi Ortiz [Sat, 16 Jun 2012 10:29:53 +0000 (12:29 +0200)]
tcp: Check the listen call

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavu/internal: define av_restrict if it has not been defined by config.h
Michael Niedermayer [Sun, 17 Jun 2012 02:48:57 +0000 (04:48 +0200)]
lavu/internal: define av_restrict if it has not been defined by config.h

This can happen if a application doesnt use ffmpegs configure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoenable C99-external_inline for icl
J. Bohl [Fri, 15 Jun 2012 22:20:18 +0000 (00:20 +0200)]
enable C99-external_inline for icl

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: build some codecs only if they are actually enabled
Paul B Mahol [Mon, 11 Jun 2012 12:40:28 +0000 (12:40 +0000)]
lavc: build some codecs only if they are actually enabled

Saves few bytes if only some of them in same file are enabled.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoChange all uses of restrict to use av_restrict instead.
Ronald S. Bultje [Fri, 15 Jun 2012 22:52:05 +0000 (15:52 -0700)]
Change all uses of restrict to use av_restrict instead.

Defining restrict results - for some compilers - in changing other
uses of the restrict keyword also, e.g. __declspec(restrict) gets
changed to __declspec(__restrict) on MSVC. This causes compilation
failures. Therefore, using a private namespace macro instead is
more reliable and robust.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 16 Jun 2012 21:22:37 +0000 (23:22 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  flacdec: read attached pictures.
  lavf: don't segfault when a NULL filename is passed to avformat_open_input()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodiracdsp: try to fix segfault
Michael Niedermayer [Sat, 16 Jun 2012 21:16:07 +0000 (23:16 +0200)]
diracdsp: try to fix segfault

This might fix Ticket1412

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: update some deprecated functions
Paul B Mahol [Sat, 16 Jun 2012 09:47:46 +0000 (09:47 +0000)]
lavfi: update some deprecated functions

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoffmenc: use av_assert
Michael Niedermayer [Sat, 16 Jun 2012 15:59:01 +0000 (17:59 +0200)]
ffmenc: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo_common.h: use av_assert
Michael Niedermayer [Sat, 16 Jun 2012 15:58:40 +0000 (17:58 +0200)]
mpegvideo_common.h: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosws/swscale_unscaled: use av_assert
Michael Niedermayer [Sat, 16 Jun 2012 15:30:57 +0000 (17:30 +0200)]
sws/swscale_unscaled: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosws/utils: use av_assert
Michael Niedermayer [Sat, 16 Jun 2012 15:29:32 +0000 (17:29 +0200)]
sws/utils: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflacdec: read attached pictures.
Anton Khirnov [Fri, 15 Jun 2012 12:39:23 +0000 (14:39 +0200)]
flacdec: read attached pictures.

6 years agolavf: don't segfault when a NULL filename is passed to avformat_open_input()
Anton Khirnov [Fri, 15 Jun 2012 17:58:11 +0000 (19:58 +0200)]
lavf: don't segfault when a NULL filename is passed to avformat_open_input()

This can easily happen when the caller is using a custom AVIOContext.

Behave as if the filename was an empty string in this case.

CC: libav-stable@libav.org
6 years agolavfi/super2xsai: fix fate test on bigendian
Paul B Mahol [Sat, 16 Jun 2012 09:35:05 +0000 (09:35 +0000)]
lavfi/super2xsai: fix fate test on bigendian

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agomd5: consistently use uint32_t instead of unsigned int
Giorgio Vazzana [Fri, 15 Jun 2012 15:21:36 +0000 (17:21 +0200)]
md5: consistently use uint32_t instead of unsigned int

Basically to make code clearer and adherent to the
standard. RFC 1321, on page 2 states

Let the symbol "+" denote addition of words (i.e., modulo-2^32
addition). Let X <<< s denote the 32-bit value obtained by circularly
shifting (rotating) X left by s bit positions.

on page 3, section 3.3 states:

A four-word buffer (A,B,C,D) is used to compute the message digest.
Here each of A, B, C, D is a 32-bit register.

so the algorithm needs to work with integers that are exactly 32bits
in length. And indeed in struct AVMD5 the MD buffer is declared as
"uint32_t ABCD[4];", while in the function that performs the block
transformation the state variables were "unsigned int"s. On
architectures where sizeof(unsigned int) != sizeof(uint32_t) this
could be a problem, although I can't name such an architecture from
the top of my head.
On a side note, both the reference implementation in RFC 1321 and the
gnulib implementation (used by md5sum program on GNU systems) use
uint32_t in the transform function.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: add my GPG fingerprint.
Clément Bœsch [Sat, 16 Jun 2012 00:50:00 +0000 (02:50 +0200)]
MAINTAINERS: add my GPG fingerprint.

6 years agovf_pad: check that we have write permission before writing in the buffer.
Michael Niedermayer [Fri, 15 Jun 2012 23:54:11 +0000 (01:54 +0200)]
vf_pad: check that we have write permission before writing in the buffer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: add asetnsamples audio filter
Stefano Sabatini [Fri, 25 May 2012 11:14:53 +0000 (13:14 +0200)]
lavfi: add asetnsamples audio filter

This filter changes the number of samples on single output operation.

Based on a patch by Andrey Utkin <andrey.krieger.utkin@gmail.com>.

6 years agolavfi/split: give a more accurate description to split
Stefano Sabatini [Fri, 15 Jun 2012 14:49:09 +0000 (16:49 +0200)]
lavfi/split: give a more accurate description to split

The filter now supports a configurable number of outputs.

6 years agoffprobe: add writer_print_rational()
Stefano Sabatini [Wed, 13 Jun 2012 12:33:32 +0000 (14:33 +0200)]
ffprobe: add writer_print_rational()

Improve overall consistency, allow some factorization.

6 years agodoc/filters: prefer @itemize environment for frei0r examples
Stefano Sabatini [Thu, 14 Jun 2012 23:47:47 +0000 (01:47 +0200)]
doc/filters: prefer @itemize environment for frei0r examples

6 years agodoc/filters: update Frei0r website link
Stefano Sabatini [Thu, 14 Jun 2012 23:40:45 +0000 (01:40 +0200)]
doc/filters: update Frei0r website link

Frei0r recently changed website host.

6 years agolavfi/super2xsai: simplify code updating the color matrix at each y iteration
Stefano Sabatini [Thu, 14 Jun 2012 22:50:43 +0000 (00:50 +0200)]
lavfi/super2xsai: simplify code updating the color matrix at each y iteration

Remove duplicated out-of-loop init code, and do color matrix
initialization at the beginning of each y iteration.

Allow factorization and avoid an useless matrix update in the last
iteration.

6 years agolavfi/super2xsai: fix table used to update color matrix at the end of each y loop
Stefano Sabatini [Thu, 14 Jun 2012 22:40:15 +0000 (00:40 +0200)]
lavfi/super2xsai: fix table used to update color matrix at the end of each y loop

The previous table appears to be wrong (it was copied from the original
MPlayer super2xsai filter in order to keep binary compatibility).

The new table is consistent with the init code and apparently fixes a
combing artifact on the left edge of the generated image.

6 years agofate/lavfi: add lavfi-pixfmts_super2xsai test
Stefano Sabatini [Thu, 14 Jun 2012 22:33:33 +0000 (00:33 +0200)]
fate/lavfi: add lavfi-pixfmts_super2xsai test

6 years agolavfi/video: set output frame w/h properties in default_start_frame()
Stefano Sabatini [Thu, 14 Jun 2012 11:12:18 +0000 (13:12 +0200)]
lavfi/video: set output frame w/h properties in default_start_frame()

Use the same values of the video output link.

Avoid the need to override the default_start_frame() with an ad-hoc
start_frame() callback.

In particular, fix the super2xsai filter which was setting the
input w/h values in the output.

6 years agolavfi/avcodec: add consistency checks in avfilter_copy_buf_props()
Stefano Sabatini [Sun, 10 Jun 2012 16:17:50 +0000 (18:17 +0200)]
lavfi/avcodec: add consistency checks in avfilter_copy_buf_props()

The function will abort through an assert if the source is not defined,
or if the internal state of the source is inconsistent (e.g. type = AUDIO
&& !src->audio).

6 years agolavc/rawdec: fix various bogus error codes and add some logs
Stefano Sabatini [Thu, 14 Jun 2012 11:10:14 +0000 (13:10 +0200)]
lavc/rawdec: fix various bogus error codes and add some logs

Help debugging.

6 years agolavc/utils: in avcodec_decode_video2() return proper error code instead of -1
Stefano Sabatini [Thu, 14 Jun 2012 11:02:57 +0000 (13:02 +0200)]
lavc/utils: in avcodec_decode_video2() return proper error code instead of -1

Return AVERROR(EINVAL) in case of invalid coded size.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 15 Jun 2012 18:55:37 +0000 (20:55 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  af_resample: fix format modifier in debug string for FF_API_SAMPLERATE64
  segment: remove unnecessary <strings.h> include
  fate: add snow hpel tests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaf_resample: fix format modifier in debug string for FF_API_SAMPLERATE64
Janne Grunau [Fri, 15 Jun 2012 14:07:29 +0000 (16:07 +0200)]
af_resample: fix format modifier in debug string for FF_API_SAMPLERATE64

6 years agosegment: remove unnecessary <strings.h> include
Janne Grunau [Thu, 14 Jun 2012 16:41:47 +0000 (18:41 +0200)]
segment: remove unnecessary <strings.h> include

6 years agofate: add snow hpel tests
Mans Rullgard [Thu, 14 Jun 2012 12:58:08 +0000 (12:58 +0000)]
fate: add snow hpel tests

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
6 years agoj2kdec: move s->avctx initialization to j2kdec_init()
Paul B Mahol [Tue, 27 Mar 2012 16:35:09 +0000 (16:35 +0000)]
j2kdec: move s->avctx initialization to j2kdec_init()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoj2kdec: check colorspace ncomponents
Paul B Mahol [Fri, 15 Jun 2012 11:46:12 +0000 (11:46 +0000)]
j2kdec: check colorspace ncomponents

This prevents out of array read.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agonutenc: use av_assert
Michael Niedermayer [Fri, 15 Jun 2012 17:38:03 +0000 (19:38 +0200)]
nutenc: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoamr: use av_assert()
Michael Niedermayer [Fri, 15 Jun 2012 17:37:53 +0000 (19:37 +0200)]
amr: use av_assert()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/aviobuf: use av_assert()
Michael Niedermayer [Fri, 15 Jun 2012 17:37:03 +0000 (19:37 +0200)]
lavf/aviobuf: use av_assert()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: cosmetic: format else with indentation
Michael Bradshaw [Thu, 14 Jun 2012 16:54:09 +0000 (10:54 -0600)]
lavf: cosmetic: format else with indentation

Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/microdvddec: fix color parsing.
Clément Bœsch [Fri, 15 Jun 2012 16:42:10 +0000 (18:42 +0200)]
lavc/microdvddec: fix color parsing.

6 years agolavc/microdvddec: properly reset non persistent color tag.
Clément Bœsch [Fri, 15 Jun 2012 16:41:14 +0000 (18:41 +0200)]
lavc/microdvddec: properly reset non persistent color tag.

6 years agolavf/{srt,microdvd}: correctly raise error on avformat_new_stream() error.
Clément Bœsch [Fri, 15 Jun 2012 16:40:14 +0000 (18:40 +0200)]
lavf/{srt,microdvd}: correctly raise error on avformat_new_stream() error.

6 years agofile: Fix handling of windows named pipes
Martin Sliwka [Fri, 15 Jun 2012 13:05:33 +0000 (15:05 +0200)]
file: Fix handling of windows named pipes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavio: Collect and print statistics of bytes read & seeks
Michael Niedermayer [Sat, 2 Jun 2012 21:01:13 +0000 (23:01 +0200)]
avio: Collect and print statistics of bytes read & seeks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: af_amerge options array was not ended with NULL
William Yu [Fri, 15 Jun 2012 07:46:13 +0000 (15:46 +0800)]
lavfi: af_amerge options array was not ended with NULL

Add a NULL to prevent undefined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agorevert "extern inline" usage
Michael Niedermayer [Fri, 15 Jun 2012 08:29:13 +0000 (10:29 +0200)]
revert "extern inline" usage

as it breaks ICC:
libavcodec/libavcodec.a(snowenc.o): In function `encode_q_branch':
/home/fate/x86_64-linux-gnu-icc-2011.4.191/src/libavcodec/snowenc.c:405: undefined reference to `ff_epzs_motion_search'
/home/fate/x86_64-linux-gnu-icc-2011.4.191/src/libavcodec/snowenc.c:414: undefined reference to `ff_get_mb_score'

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agonew attribute "extern inline" (fixing linker error with ff_get_mb_score and ff_get_mb...
J. Bohl [Thu, 14 Jun 2012 21:09:52 +0000 (23:09 +0200)]
new attribute "extern inline" (fixing linker error with ff_get_mb_score and ff_get_mb_score)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: do not auto enable mlp decoder when enabling truehd decoder
Paul B Mahol [Thu, 14 Jun 2012 21:51:23 +0000 (21:51 +0000)]
configure: do not auto enable mlp decoder when enabling truehd decoder

It is generally bad idea even if codecs use same code.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoRemove duplicated png and mng signatures.
Paul B Mahol [Thu, 14 Jun 2012 23:18:07 +0000 (23:18 +0000)]
Remove duplicated png and mng signatures.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agomatroskadec: add assert on lack of overflow in pkt_size+offset
Michael Niedermayer [Thu, 14 Jun 2012 23:35:52 +0000 (01:35 +0200)]
matroskadec: add assert on lack of overflow in pkt_size+offset

currently a overflow there should be impossible but future changes to
the code could easily introduce a bug that no longer limits the 2
values sufficiently so better protect it via av_assert.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroskadec: change size check in matroska_decode_buffer() to unsigned
Michael Niedermayer [Thu, 14 Jun 2012 23:29:30 +0000 (01:29 +0200)]
matroskadec: change size check in matroska_decode_buffer() to unsigned

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroskadec: move lace_size check up so it catches all code pathes
Michael Niedermayer [Thu, 14 Jun 2012 23:28:40 +0000 (01:28 +0200)]
matroskadec: move lace_size check up so it catches all code pathes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroskadec: change assert to av_assert0()
Michael Niedermayer [Thu, 14 Jun 2012 23:27:56 +0000 (01:27 +0200)]
matroskadec: change assert to av_assert0()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix incorrect unsigned->signed conversion.
Dale Curtis [Thu, 14 Jun 2012 22:22:25 +0000 (15:22 -0700)]
Fix incorrect unsigned->signed conversion.

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 14 Jun 2012 22:09:39 +0000 (00:09 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Avoid C99 variable declarations within for statements.
  rtmp: Read and handle incoming packets while writing data
  doc: document THREAD_TYPE fate variable
  rtpdec: Don't require frames to start with a Mode A packet
  avconv: don't try to free threads that were not initialized.

Conflicts:
doc/fate.texi
ffplay.c
libavdevice/dv1394.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoriff: use av_assert
Michael Niedermayer [Thu, 14 Jun 2012 21:52:56 +0000 (23:52 +0200)]
riff: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agorawdec: use av_assert()
Michael Niedermayer [Thu, 14 Jun 2012 21:52:40 +0000 (23:52 +0200)]
rawdec: use av_assert()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopcmdec: use av_assert()
Michael Niedermayer [Thu, 14 Jun 2012 21:52:23 +0000 (23:52 +0200)]
pcmdec: use av_assert()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAvoid C99 variable declarations within for statements.
Diego Biurrun [Thu, 14 Jun 2012 08:19:06 +0000 (10:19 +0200)]
Avoid C99 variable declarations within for statements.

We generally do not declare variables within for statements and
there are compilers that choke on such constructs.

6 years agomjpegenc: support slice multithreading
Michael Niedermayer [Thu, 14 Jun 2012 14:26:15 +0000 (16:26 +0200)]
mjpegenc: support slice multithreading

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortmp: Read and handle incoming packets while writing data
Samuel Pitoiset [Thu, 14 Jun 2012 13:28:40 +0000 (15:28 +0200)]
rtmp: Read and handle incoming packets while writing data

This makes sure all incoming packets are read and handled (and reacted
to) while sending an FLV stream over RTMP to a server. If there were
enough incoming data to fill the TCP buffers, this could potentially
make things block at unexpected places. For the upcoming RTMPT support,
we need to consume all incoming data before we can send the next
request.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agodoc: document THREAD_TYPE fate variable
Luca Barbato [Thu, 14 Jun 2012 18:27:31 +0000 (20:27 +0200)]
doc: document THREAD_TYPE fate variable

6 years agortpdec: Don't require frames to start with a Mode A packet
Martin Storsjö [Thu, 14 Jun 2012 12:13:14 +0000 (15:13 +0300)]
rtpdec: Don't require frames to start with a Mode A packet

While there is no reason for starting a frame with anything else
than a Mode A packet, some senders seem to consistently use Mode B
packets for everything. This fixes depacketization of such streams.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agopng_parser: use designated initializers
Paul B Mahol [Thu, 14 Jun 2012 17:04:00 +0000 (17:04 +0000)]
png_parser: use designated initializers

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoAdd truehd decoder line.
Paul B Mahol [Thu, 14 Jun 2012 15:47:59 +0000 (15:47 +0000)]
Add truehd decoder line.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoflashsv2enc: align codec declarations
Paul B Mahol [Thu, 14 Jun 2012 15:19:43 +0000 (15:19 +0000)]
flashsv2enc: align codec declarations

While here constify enums for .pix_fmts.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agog729dec: align codec declarations
Paul B Mahol [Thu, 14 Jun 2012 15:12:02 +0000 (15:12 +0000)]
g729dec: align codec declarations

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agomjpegdec: remove superfluous "mjpeg "
Paul B Mahol [Mon, 11 Jun 2012 12:32:47 +0000 (12:32 +0000)]
mjpegdec: remove superfluous "mjpeg "

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agobprint: implement vsnprintf for win32.
Nicolas George [Thu, 14 Jun 2012 11:54:00 +0000 (13:54 +0200)]
bprint: implement vsnprintf for win32.

6 years agoavconv: don't try to free threads that were not initialized.
Anton Khirnov [Wed, 13 Jun 2012 11:33:42 +0000 (13:33 +0200)]
avconv: don't try to free threads that were not initialized.

6 years agovqavideo: pass context to remaining av_(d)log
Paul B Mahol [Thu, 14 Jun 2012 02:38:35 +0000 (02:38 +0000)]
vqavideo: pass context to remaining av_(d)log

Finally get rid of all superfluous strings from av_log messages.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoasfdec: fix returned error codes
Martin T. H. Sandsmark [Thu, 14 Jun 2012 00:30:55 +0000 (02:30 +0200)]
asfdec: fix returned error codes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: support Bitrig OS
David Hill [Wed, 13 Jun 2012 23:56:29 +0000 (19:56 -0400)]
configure: support Bitrig OS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: fix SLIBNAME_WITH_MAJOR for openbsd (and bitrig in the next commit)
David Hill [Thu, 14 Jun 2012 00:20:47 +0000 (02:20 +0200)]
configure: fix SLIBNAME_WITH_MAJOR for openbsd (and bitrig in the next commit)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate.texi: fix typo in title
Michael Niedermayer [Wed, 13 Jun 2012 23:38:59 +0000 (01:38 +0200)]
fate.texi: fix typo in title

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 13 Jun 2012 19:04:06 +0000 (21:04 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmp: Add a new option 'rtmp_buffer', for setting the client buffer time
  rtmp: Set the client buffer time to 3s instead of 0.26s
  rtmp: Handle server bandwidth packets
  rtmp: Display a verbose message when an unknown packet type is received
  lavfi/audio: use av_samples_copy() instead of custom code.
  configure: add all filters hardcoded into avconv to avconv_deps
  avfiltergraph: remove a redundant call to avfilter_get_by_name().
  lavfi: allow building without swscale.
  build: Do not delete tests/vsynth2 directory, which is no longer created.
  lavfi: replace AVFilterContext.input/output_count with nb_inputs/outputs
  lavfi: make AVFilterPad opaque after two major bumps.
  lavfi: add avfilter_pad_get_type() and avfilter_pad_get_name().
  lavfi: make avfilter_get_video_buffer() private on next bump.
  jack: update to new latency range API as the old one has been deprecated
  rtmp: Tokenize the AMF connection parameters manually instead of using strtok_r
  ppc: Rename H.264 optimization template file for consistency.
  lavfi: add channelsplit audio filter.
  golomb: check remaining bits during unary decoding in get_ur_golomb_jpegls()
  sws: fix planar RGB input conversions for 9/10/16 bpp.

Conflicts:
Changelog
configure
doc/APIchanges
ffmpeg.c
libavcodec/golomb.h
libavcodec/v210dec.h
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/asrc_anullsrc.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c
libavfilter/formats.c
libavfilter/version.h
libavfilter/vf_frei0r.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/video.h
libavfilter/vsrc_color.c
libavformat/rtmpproto.c
libswscale/input.c
tests/Makefile

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