ffmpeg.git
5 years agolavc/elbg: rename ff_ symbols to avpriv_, so they can be used in shared libs
Stefano Sabatini [Tue, 12 Nov 2013 11:58:21 +0000 (12:58 +0100)]
lavc/elbg: rename ff_ symbols to avpriv_, so they can be used in shared libs

In particular, allows the use of elbg in other FFmpeg libraries, required
by the pending elbg filter.

5 years agovorbis: handle special packets in the middle of a stream
Ben Boeckel [Mon, 28 Oct 2013 02:47:31 +0000 (22:47 -0400)]
vorbis: handle special packets in the middle of a stream

This allows for updating metadata from new metadata packets in the
middle of a stream (e.g., MPD streams). There still needs to be a signal
that there *is* new metadata, but this is at least gets the data into a
data structure.

Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/vqf: check a few more bits in probe
Michael Niedermayer [Tue, 12 Nov 2013 21:26:34 +0000 (22:26 +0100)]
avformat/vqf: check a few more bits in probe

Fixes probetest failure
The threshold is choosen so that a all printale ascii string will never be
detected as vqf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vp9: use av_freep() for above_partition_ctx
Paul B Mahol [Sun, 10 Nov 2013 19:16:14 +0000 (19:16 +0000)]
avcodec/vp9: use av_freep() for above_partition_ctx

Fixes use after free if memory allocation fails.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavformat/smacker: check width/height in probe
Michael Niedermayer [Tue, 12 Nov 2013 18:37:37 +0000 (19:37 +0100)]
avformat/smacker: check width/height in probe

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo_motion: Handle edge emulation even without unrestricted_mv
Michael Niedermayer [Tue, 12 Nov 2013 15:11:42 +0000 (16:11 +0100)]
avcodec/mpegvideo_motion: Handle edge emulation even without unrestricted_mv

Fixes out of array reads
Fixes part of: MSVR 440 (the other issues seem to have been fixed already)
Found-by: Jeremy Brown (jerbrown) of ReSP
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMAINTAINERS: Add 1.2 back to the maintained releases
Michael Niedermayer [Tue, 12 Nov 2013 13:32:53 +0000 (14:32 +0100)]
MAINTAINERS: Add 1.2 back to the maintained releases

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix example in pullup documentation.
Lou Logan [Tue, 12 Nov 2013 13:22:15 +0000 (14:22 +0100)]
Fix example in pullup documentation.

The pullup filter does not work well with the fps filter, it
currently needs -r

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
5 years agolibavcodec/xsubenc.c: set coded_bits_per_sample
Erik Olofsson [Thu, 7 Nov 2013 20:07:11 +0000 (21:07 +0100)]
libavcodec/xsubenc.c: set coded_bits_per_sample

Explicitly set the number of bits per sample to stop
the avi muxer from guessing at 24 bits.
The result is that bits per pixel in the avi stream header
matches what other XSUB muxers produce, such as AVIAddXSubs.exe

Signed-off-by: Erik Olofsson <eaj.olofsson@gmail.com>
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/xsubenc.c: Fix bounding box coordinates
Erik Olofsson [Thu, 7 Nov 2013 20:07:10 +0000 (21:07 +0100)]
libavcodec/xsubenc.c: Fix bounding box coordinates

Fix coordinates of the lower right corner of the text area.
Note that the coordinates are redundant as the size and
position of the text area are known.
Many decoders (including Sony Playstation 3, VLC and FFmpeg)
ignore the redundant coordinates.
Some hardware decoders need them for correct playback.

Verified on Philips DVD player models HTS7201 and DVP3380.

Fixes ticket #3031

Signed-off-by: Erik Olofsson <eaj.olofsson@gmail.com>
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Mon, 11 Nov 2013 21:29:45 +0000 (22:29 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  libzvbi-teletextdec: propagate errors generated in page handler
  libzvbi-teletextdec: dont ignore memory allocation error silently
  libzvbi-teletextdec: output ass subtitles instead of plain text
  ass: move text_event_to_ass from textdec.c to ass.c and export it
  ass: fix error handling in ff_ass_add_subrect
  ass: factor out ff_ass_bprint_dialog
  libzvbi-teletextdec: use AVBPrint for whitespace cleanup
  libzvbi-teletextdec: use option constants instead of strings
  libzvbi-teletextdec: fix indentation after last commit
  libzvbi-teletextdec: support multiple teletext pages in a single packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 11 Nov 2013 21:21:38 +0000 (22:21 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegaudioenc: Move some static tables to MpegAudioContext

Conflicts:
libavcodec/mpegaudioenc.c
libavcodec/mpegaudiotab.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5d6a990c115850326711c2f5be4d9fd33f399616'
Michael Niedermayer [Mon, 11 Nov 2013 20:46:35 +0000 (21:46 +0100)]
Merge commit '5d6a990c115850326711c2f5be4d9fd33f399616'

* commit '5d6a990c115850326711c2f5be4d9fd33f399616':
  mpegaudioenc: Remove broken integer-only quantization code path

Conflicts:
libavcodec/mpegaudioenc.c

Mostly not merged, the integer code works fine.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/electronicarts: check chunksize more completely in probe()
Michael Niedermayer [Mon, 11 Nov 2013 18:53:22 +0000 (19:53 +0100)]
avformat/electronicarts: check chunksize more completely in probe()

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/electronicarts: check chunk size.
Michael Niedermayer [Mon, 11 Nov 2013 18:51:12 +0000 (19:51 +0100)]
avformat/electronicarts: check chunk size.

Fix infinite loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/dfa: check first frame offset in probe
Michael Niedermayer [Mon, 11 Nov 2013 17:11:43 +0000 (18:11 +0100)]
avformat/dfa: check first frame offset in probe

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/bethsoftvid: check 4th header byte in probe
Michael Niedermayer [Mon, 11 Nov 2013 16:26:03 +0000 (17:26 +0100)]
avformat/bethsoftvid: check 4th header byte in probe

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/avr: check channels and bps in probe
Michael Niedermayer [Mon, 11 Nov 2013 13:51:43 +0000 (14:51 +0100)]
avformat/avr: check channels and bps in probe

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: disabled debug code to collect format probing statistics
Michael Niedermayer [Sat, 9 Nov 2013 15:59:10 +0000 (16:59 +0100)]
avformat/utils: disabled debug code to collect format probing statistics

This allows collecting statistics on probing scores and the amount of data
probing needed for various files and formats.
For example it can be used to find out which formats tend to need more
data for probing or which files are probed with less certain/lower scores

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: delete viterbi.txt
Timothy Gu [Sat, 9 Nov 2013 23:36:37 +0000 (15:36 -0800)]
doc: delete viterbi.txt

The description has been moved to the FFmpeg wiki:
https://trac.ffmpeg.org/wiki/ViterbiAlgorithm

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
5 years agoffmpeg: remove unneeded include "libswscale/swscale.h"
Michael Niedermayer [Sun, 10 Nov 2013 20:42:40 +0000 (21:42 +0100)]
ffmpeg: remove unneeded include "libswscale/swscale.h"

Found-by: ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibzvbi-teletextdec: propagate errors generated in page handler
Marton Balint [Fri, 25 Oct 2013 19:12:23 +0000 (21:12 +0200)]
libzvbi-teletextdec: propagate errors generated in page handler

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agolibzvbi-teletextdec: dont ignore memory allocation error silently
Marton Balint [Fri, 25 Oct 2013 19:02:00 +0000 (21:02 +0200)]
libzvbi-teletextdec: dont ignore memory allocation error silently

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agolibzvbi-teletextdec: output ass subtitles instead of plain text
Marton Balint [Wed, 23 Oct 2013 22:04:05 +0000 (00:04 +0200)]
libzvbi-teletextdec: output ass subtitles instead of plain text

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoavfilter/fade: use FADE_OUT macro.
Clément Bœsch [Sun, 10 Nov 2013 18:16:45 +0000 (19:16 +0100)]
avfilter/fade: use FADE_OUT macro.

5 years agoavfilter/fade: remove a bunch of useless parenthesis.
Clément Bœsch [Sun, 10 Nov 2013 18:15:19 +0000 (19:15 +0100)]
avfilter/fade: remove a bunch of useless parenthesis.

5 years agoavfilter/fade: use inlink->frame_count.
Clément Bœsch [Sun, 10 Nov 2013 18:12:36 +0000 (19:12 +0100)]
avfilter/fade: use inlink->frame_count.

5 years agoavfilter/fade: add color option.
Clément Bœsch [Fri, 8 Nov 2013 22:59:40 +0000 (23:59 +0100)]
avfilter/fade: add color option.

Fixes Ticket #1822.

5 years agoass: move text_event_to_ass from textdec.c to ass.c and export it
Marton Balint [Wed, 23 Oct 2013 18:03:17 +0000 (20:03 +0200)]
ass: move text_event_to_ass from textdec.c to ass.c and export it

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoass: fix error handling in ff_ass_add_subrect
Marton Balint [Wed, 23 Oct 2013 09:27:25 +0000 (11:27 +0200)]
ass: fix error handling in ff_ass_add_subrect

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoass: factor out ff_ass_bprint_dialog
Marton Balint [Wed, 23 Oct 2013 09:20:04 +0000 (11:20 +0200)]
ass: factor out ff_ass_bprint_dialog

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agolibzvbi-teletextdec: use AVBPrint for whitespace cleanup
Marton Balint [Wed, 23 Oct 2013 21:15:54 +0000 (23:15 +0200)]
libzvbi-teletextdec: use AVBPrint for whitespace cleanup

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agolibzvbi-teletextdec: use option constants instead of strings
Marton Balint [Sun, 20 Oct 2013 18:50:54 +0000 (20:50 +0200)]
libzvbi-teletextdec: use option constants instead of strings

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agolibzvbi-teletextdec: fix indentation after last commit
Marton Balint [Sun, 29 Sep 2013 13:23:37 +0000 (15:23 +0200)]
libzvbi-teletextdec: fix indentation after last commit

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agolibzvbi-teletextdec: support multiple teletext pages in a single packet
Marton Balint [Sun, 28 Jul 2013 20:07:01 +0000 (22:07 +0200)]
libzvbi-teletextdec: support multiple teletext pages in a single packet

After this patch, if a packet contains multiple teletext pages, the teletext
decoder can return the fist page and store the remaining pages in memory, and
return them to the user on the next calls to avcodec_decode_subtitle2.

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 10 Nov 2013 16:37:51 +0000 (17:37 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hwaccel: Simplify ff_find_hwaccel

Conflicts:
libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompegaudioenc: Move some static tables to MpegAudioContext
Diego Biurrun [Mon, 4 Nov 2013 20:14:03 +0000 (21:14 +0100)]
mpegaudioenc: Move some static tables to MpegAudioContext

This reduces global state and the amount of globally visible tables.

5 years agompegaudioenc: Remove broken integer-only quantization code path
Diego Biurrun [Sat, 9 Nov 2013 13:17:16 +0000 (14:17 +0100)]
mpegaudioenc: Remove broken integer-only quantization code path

5 years agoavformat/diracdec: check 2 chunks in probe
Michael Niedermayer [Sun, 10 Nov 2013 15:04:33 +0000 (16:04 +0100)]
avformat/diracdec: check 2 chunks in probe

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohwaccel: Simplify ff_find_hwaccel
Luca Barbato [Sat, 9 Nov 2013 16:07:34 +0000 (17:07 +0100)]
hwaccel: Simplify ff_find_hwaccel

It is always called by passing fields from an AVCodecContext.

5 years agoavformat/astdec: increase the score for odd samplerate/channels to max/8
Michael Niedermayer [Sun, 10 Nov 2013 12:10:23 +0000 (13:10 +0100)]
avformat/astdec: increase the score for odd samplerate/channels to max/8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rsd: increase the score for odd samplerate/channels to max/8
Michael Niedermayer [Sun, 10 Nov 2013 12:10:23 +0000 (13:10 +0100)]
avformat/rsd: increase the score for odd samplerate/channels to max/8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/lvfdec: increase the score for odd channels to max/8
Michael Niedermayer [Sun, 10 Nov 2013 12:10:23 +0000 (13:10 +0100)]
avformat/lvfdec: increase the score for odd channels to max/8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/swfdec: return AVPROBE_SCORE_MAX / 4 for unexpected versions
Michael Niedermayer [Sun, 10 Nov 2013 11:53:38 +0000 (12:53 +0100)]
avformat/swfdec: return AVPROBE_SCORE_MAX / 4 for unexpected versions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/ape: check version in probe
Michael Niedermayer [Sun, 10 Nov 2013 11:48:33 +0000 (12:48 +0100)]
avformat/ape: check version in probe

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/encoders: fix libfdk-aac "Examples" subsection
Timothy Gu [Sat, 9 Nov 2013 23:04:36 +0000 (15:04 -0800)]
doc/encoders: fix libfdk-aac "Examples" subsection

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agoavcodec/vp8: remove unused webp_decode_frame()
Michael Niedermayer [Sun, 10 Nov 2013 11:21:54 +0000 (12:21 +0100)]
avcodec/vp8: remove unused webp_decode_frame()

See: libavcodec/webp.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/dv: remove unused variable
Michael Niedermayer [Sun, 10 Nov 2013 11:20:40 +0000 (12:20 +0100)]
avformat/dv: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/doxy-wrapper: disable inserting headers and footers
Timothy Gu [Sat, 9 Nov 2013 23:20:15 +0000 (15:20 -0800)]
doc/doxy-wrapper: disable inserting headers and footers

The headers and footers are used to integrate Doxygen into Libav's website.
Fixes the Libav-ish look when doing `make apidoc`.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/thp: check fps value during probing
Michael Niedermayer [Sun, 10 Nov 2013 00:42:22 +0000 (01:42 +0100)]
avformat/thp: check fps value during probing

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/thp: do not set sample_rate for a video codec
Michael Niedermayer [Sun, 10 Nov 2013 00:28:32 +0000 (01:28 +0100)]
avformat/thp: do not set sample_rate for a video codec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovp9: fix mvref finding to adhere to bug in libvpx.
Ronald S. Bultje [Sat, 9 Nov 2013 15:52:49 +0000 (10:52 -0500)]
vp9: fix mvref finding to adhere to bug in libvpx.

Fixes a particular youtube video that I unfortunately can't share.

5 years agolibavf/avienc: store language metadata for XSUB streams
Erik Olofsson [Sat, 9 Nov 2013 19:26:00 +0000 (20:26 +0100)]
libavf/avienc: store language metadata for XSUB streams

Formatted in such a way that DivX certified players can decode it.
Verified on Sony Playstation 3 and Philips DVP3380.

Fixes ticket 2385

Signed-off-by: Erik Olofsson <eaj.olofsson@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: generate more specific error message in case of inconsistent filtering options
Stefano Sabatini [Mon, 4 Nov 2013 09:05:24 +0000 (10:05 +0100)]
ffmpeg: generate more specific error message in case of inconsistent filtering options

In particular, distinguish if the option was -filter or -filter_script.

Suggested-by: Nicolas George
5 years agoffmpeg: store value of -filter and -filter_script per-stream option in OutputStream...
Stefano Sabatini [Mon, 4 Nov 2013 09:02:27 +0000 (10:02 +0100)]
ffmpeg: store value of -filter and -filter_script per-stream option in OutputStream struct

Avoid the need for multiple potentially inconsistent access operations,
slightly factorize code.

5 years agoavformat/dv: consider a header match at byte 0 to count as detection of dv in probe
Michael Niedermayer [Sat, 9 Nov 2013 16:31:35 +0000 (17:31 +0100)]
avformat/dv: consider a header match at byte 0 to count as detection of dv in probe

This reduces the amount of data needed to identify dv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompegts: only calculate stat index when its needed during probe
Michael Niedermayer [Sat, 9 Nov 2013 15:09:26 +0000 (16:09 +0100)]
mpegts: only calculate stat index when its needed during probe

40% faster probe

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegts: do not hardcode type used in memset()
Michael Niedermayer [Sat, 9 Nov 2013 15:03:41 +0000 (16:03 +0100)]
avformat/mpegts: do not hardcode type used in memset()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/dv: about 3 times faster probe
Michael Niedermayer [Sat, 9 Nov 2013 13:43:51 +0000 (14:43 +0100)]
avformat/dv: about 3 times faster probe

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agobuild: avoid stdin stall with GNU AS probing.
Clément Bœsch [Fri, 8 Nov 2013 22:55:06 +0000 (23:55 +0100)]
build: avoid stdin stall with GNU AS probing.

a758c5e added probing for various tools, such as AS. Unfortunately, GNU
AS is reading stdin with -v, and thus configure is stalled with
configure arguments such as --as=as.

Fixes Ticket #1898.

5 years agoriff: add VP9 fourcc
James Zern [Sat, 9 Nov 2013 04:16:17 +0000 (20:16 -0800)]
riff: add VP9 fourcc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mp3dec: 4x faster probing
Michael Niedermayer [Sat, 9 Nov 2013 00:45:24 +0000 (01:45 +0100)]
avformat/mp3dec: 4x faster probing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/h261dec: dont accept invalid gobs in probe as valid
Michael Niedermayer [Sat, 9 Nov 2013 00:12:10 +0000 (01:12 +0100)]
avformat/h261dec: dont accept invalid gobs in probe as valid

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/h261dec: optimize probe
Michael Niedermayer [Fri, 8 Nov 2013 23:30:27 +0000 (00:30 +0100)]
avformat/h261dec: optimize probe

about 3 times faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 8 Nov 2013 23:10:04 +0000 (00:10 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avienc: drop the vfr flag.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: treat avi as VFR in framerate conversion code
Michael Niedermayer [Fri, 8 Nov 2013 23:03:27 +0000 (00:03 +0100)]
ffmpeg: treat avi as VFR in framerate conversion code

It can be debated if avi is vfr or cfr, it can be either depending
on the definition of vfr and cfr.
This commit ensures that avi is treated correctly independent of
the AVFMT_VARIABLE_FPS value.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45'
Michael Niedermayer [Fri, 8 Nov 2013 22:36:59 +0000 (23:36 +0100)]
Merge commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45'

* commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45':
  metasound: Fix error message argument

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mxfdec: optimize probing
Michael Niedermayer [Fri, 8 Nov 2013 20:43:27 +0000 (21:43 +0100)]
avformat/mxfdec: optimize probing

about 71 times faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotools/probetest: also print the time the probe functions needed
Michael Niedermayer [Fri, 8 Nov 2013 20:15:24 +0000 (21:15 +0100)]
tools/probetest: also print the time the probe functions needed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotools/probetest: use named constant for the maximum number of formats
Michael Niedermayer [Fri, 8 Nov 2013 19:42:13 +0000 (20:42 +0100)]
tools/probetest: use named constant for the maximum number of formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavienc: drop the vfr flag.
Anton Khirnov [Thu, 7 Nov 2013 21:02:00 +0000 (22:02 +0100)]
avienc: drop the vfr flag.

AVI does not really support vfr properly, only by padding with null
packets.

5 years agoavcodec/mimic: use av_freep() and reset swap_buf_size
Paul B Mahol [Fri, 8 Nov 2013 14:23:45 +0000 (14:23 +0000)]
avcodec/mimic: use av_freep() and reset swap_buf_size

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/vmdav: use av_freep() and reset unpack_buffer_size
Paul B Mahol [Fri, 8 Nov 2013 14:15:31 +0000 (14:15 +0000)]
avcodec/vmdav: use av_freep() and reset unpack_buffer_size

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavformat/icodec: reduce score returned on probing
Michael Niedermayer [Fri, 8 Nov 2013 19:10:33 +0000 (20:10 +0100)]
avformat/icodec: reduce score returned on probing

The ico probe function is pretty weak just checking a few bytes for being 0, 1 or not 0

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 8 Nov 2013 17:00:56 +0000 (18:00 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h263dsp: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0338c396987c82b41d322630ea9712fe5f9561d6'
Michael Niedermayer [Fri, 8 Nov 2013 16:25:13 +0000 (17:25 +0100)]
Merge commit '0338c396987c82b41d322630ea9712fe5f9561d6'

* commit '0338c396987c82b41d322630ea9712fe5f9561d6':
  dsputil: Split off H.263 bits into their own H263DSPContext

Conflicts:
configure
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/lvfdec: check stream count during probing
Michael Niedermayer [Fri, 8 Nov 2013 16:03:42 +0000 (17:03 +0100)]
avformat/lvfdec: check stream count during probing

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agometasound: Fix error message argument
Kostya Shishkov [Fri, 8 Nov 2013 09:21:07 +0000 (10:21 +0100)]
metasound: Fix error message argument

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoavformat/idcin: check the decompressed frame size during probing
Michael Niedermayer [Fri, 8 Nov 2013 14:03:21 +0000 (15:03 +0100)]
avformat/idcin: check the decompressed frame size during probing

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh263dsp: K&R formatting cosmetics
Diego Biurrun [Fri, 8 Nov 2013 02:06:09 +0000 (03:06 +0100)]
h263dsp: K&R formatting cosmetics

Also remove array element numbering comments.

5 years agodsputil: Split off H.263 bits into their own H263DSPContext
Diego Biurrun [Tue, 5 Nov 2013 07:11:47 +0000 (08:11 +0100)]
dsputil: Split off H.263 bits into their own H263DSPContext

5 years agoavformat/mov: only force parsing for video tracks if stss is empty
Hendrik Leppkes [Mon, 4 Nov 2013 15:22:27 +0000 (16:22 +0100)]
avformat/mov: only force parsing for video tracks if stss is empty

Fixes playback of some AAC streams, which are otherwise mangled by the
parser, and stss is typically only valid for video anyway.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/dvdsubdec: remove exit() call in debug code
Michael Niedermayer [Thu, 7 Nov 2013 23:31:24 +0000 (00:31 +0100)]
libavcodec/dvdsubdec: remove exit() call in debug code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 7 Nov 2013 22:39:23 +0000 (23:39 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Remove #undefs for formerly forbidden system functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/graphparser: zero filter_ctx in case of deallocation in create_filter()
Michael Niedermayer [Thu, 7 Nov 2013 22:38:44 +0000 (23:38 +0100)]
avfilter/graphparser: zero filter_ctx in case of deallocation in create_filter()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c'
Michael Niedermayer [Thu, 7 Nov 2013 22:05:26 +0000 (23:05 +0100)]
Merge commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c'

* commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c':
  avfilter/graphparser: Directly free filter memory if initialization fails

Conflicts:
libavfilter/graphparser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/unsharp: added optimized opencl kernels
Lenny Wang [Thu, 7 Nov 2013 21:15:49 +0000 (15:15 -0600)]
avfilter/unsharp: added optimized opencl kernels

Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix compilation with os2threads
Dave Yeo [Thu, 7 Nov 2013 19:10:20 +0000 (11:10 -0800)]
Fix compilation with os2threads

Signed-off-by: Dave Yeo <daveryeo@telus.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegvideodec: check seq headers more completely during probing
Michael Niedermayer [Thu, 7 Nov 2013 17:39:23 +0000 (18:39 +0100)]
avformat/mpegvideodec: check seq headers more completely during probing

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2enc: simplify split planes extension selection.
Clément Bœsch [Thu, 7 Nov 2013 19:28:44 +0000 (20:28 +0100)]
avformat/img2enc: simplify split planes extension selection.

5 years agodoc/muxers: document animated GIF muxer.
Clément Bœsch [Sat, 19 Oct 2013 18:39:30 +0000 (20:39 +0200)]
doc/muxers: document animated GIF muxer.

5 years agoavformat/gif: fix final_delay unit in documentation.
Clément Bœsch [Sat, 19 Oct 2013 18:24:58 +0000 (20:24 +0200)]
avformat/gif: fix final_delay unit in documentation.

5 years agoavformat/img2enc: reindent after previous commit.
Clément Bœsch [Thu, 7 Nov 2013 19:22:25 +0000 (20:22 +0100)]
avformat/img2enc: reindent after previous commit.

5 years agoavformat/image2: allow muxing gif files.
Clément Bœsch [Sat, 19 Oct 2013 17:39:28 +0000 (19:39 +0200)]
avformat/image2: allow muxing gif files.

Fixes Ticket #2936.

5 years agoavfilter/af_aecho: free input frame after it is being used
Paul B Mahol [Thu, 7 Nov 2013 17:45:47 +0000 (17:45 +0000)]
avfilter/af_aecho: free input frame after it is being used

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/libfdk-aacdec: remove redundant log messages
Paul B Mahol [Thu, 7 Nov 2013 14:55:35 +0000 (14:55 +0000)]
avcodec/libfdk-aacdec: remove redundant log messages

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/hnm4video: remove redundant log message
Paul B Mahol [Thu, 7 Nov 2013 14:04:21 +0000 (14:04 +0000)]
avcodec/hnm4video: remove redundant log message

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavformat/astdec: sanity check channels & sample rate
Michael Niedermayer [Wed, 6 Nov 2013 12:12:59 +0000 (13:12 +0100)]
avformat/astdec: sanity check channels & sample rate

Fixes probetest failure

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hls: fixed bug where custom http headers weren't kept for hls streams
kowalsky [Wed, 6 Nov 2013 20:01:57 +0000 (21:01 +0100)]
avformat/hls: fixed bug where custom http headers weren't kept for hls streams

See: https://trac.ffmpeg.org/ticket/3024

5 years agoRemove #undefs for formerly forbidden system functions
Diego Biurrun [Wed, 6 Nov 2013 20:07:35 +0000 (21:07 +0100)]
Remove #undefs for formerly forbidden system functions

The macros forbidding the system functions no longer exist, obviating
the need for the #undefs.