ffmpeg.git
6 years agotests/lavfi-regression: always require three parameters in do_lavfi_pixfmts()
Stefano Sabatini [Thu, 3 Jan 2013 18:48:01 +0000 (19:48 +0100)]
tests/lavfi-regression: always require three parameters in do_lavfi_pixfmts()

Force commands to specify the name of the test to run. This simplifies
extending the function with a new parameter, which will be done in a
following patch.

6 years agoFix AVCI50 SPS to specify a SAR of 4:3 instead of 3:4.
Carl Eugen Hoyos [Sat, 5 Jan 2013 08:20:03 +0000 (09:20 +0100)]
Fix AVCI50 SPS to specify a SAR of 4:3 instead of 3:4.

6 years agolavfi/drawutils: fix typo
Matthieu Bouron [Fri, 4 Jan 2013 21:08:12 +0000 (22:08 +0100)]
lavfi/drawutils: fix typo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu: check av_clip*() limits
Michael Niedermayer [Wed, 21 Nov 2012 21:53:06 +0000 (22:53 +0100)]
lavu: check av_clip*() limits

This code cannot use av_assert* due to circular header dependancies

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: remove img_get_alpha_info as it not available any more
Paul B Mahol [Fri, 4 Jan 2013 20:11:19 +0000 (20:11 +0000)]
lavc: remove img_get_alpha_info as it not available any more

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agompegpsenc: avoid shifting dts/pts
Michael Niedermayer [Fri, 4 Jan 2013 19:28:45 +0000 (20:28 +0100)]
mpegpsenc: avoid shifting dts/pts

Only shift if needed to avoid negative scr when requested
or for dvd.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegpsenc: show first SCR/DTS at debug level
Michael Niedermayer [Fri, 4 Jan 2013 19:15:56 +0000 (20:15 +0100)]
mpegpsenc: show first SCR/DTS at debug level

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegpsenc: move preload recalculation to where its needed
Michael Niedermayer [Fri, 4 Jan 2013 19:15:11 +0000 (20:15 +0100)]
mpegpsenc: move preload recalculation to where its needed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegpsenc: Fix SCR handling for DVD
Michael Niedermayer [Fri, 4 Jan 2013 18:50:48 +0000 (19:50 +0100)]
mpegpsenc: Fix SCR handling for DVD

This makes the initial SCR equal 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegpsenc: restructure SCR handling
Michael Niedermayer [Fri, 4 Jan 2013 18:44:27 +0000 (19:44 +0100)]
mpegpsenc: restructure SCR handling

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoau: use ff_raw_write_packet()
Justin Ruggles [Fri, 4 Jan 2013 19:52:57 +0000 (19:52 +0000)]
au: use ff_raw_write_packet()

6 years agoFix "knwon" typo and add a check in tools/patcheck
Paul B Mahol [Fri, 4 Jan 2013 19:12:08 +0000 (19:12 +0000)]
Fix "knwon" typo and add a check in tools/patcheck

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agofixed granularity of video quality when encoding with theora codec
Maximilian Seesslen [Fri, 4 Jan 2013 15:56:00 +0000 (16:56 +0100)]
fixed granularity of video quality when encoding with theora codec

The floating point version of av_clip has to be used when converting the quality level.

Signed-off-by: Maximilian Seesslen <mes@seesslen.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomsrle: fix small palette handling
Michael Niedermayer [Fri, 4 Jan 2013 15:37:20 +0000 (16:37 +0100)]
msrle: fix small palette handling

Fixes second file in Ticket1273

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolswr: Improve default resampler's default parameters
Alexander Strasser [Tue, 25 Dec 2012 22:14:09 +0000 (23:14 +0100)]
lswr: Improve default resampler's default parameters

After making some blind tests on a small collection of music
samples for home usage. It turned out that the default cutoff
was too low.

The impact of filter_size was not clearly distinguishable (the
results were on the edge) with the music samples but turned out
to be clearly audible in some synthetic samples.

Thanks to Daniel for helping out with the listening tests.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 4 Jan 2013 12:29:09 +0000 (13:29 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavr: fix missing " in header documentation
  aviobuf: Discard old buffered, previously read data in ffio_read_partial

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e96406eda4f143f101bd44372f7b2d542183000a'
Michael Niedermayer [Fri, 4 Jan 2013 12:23:19 +0000 (13:23 +0100)]
Merge commit 'e96406eda4f143f101bd44372f7b2d542183000a'

* commit 'e96406eda4f143f101bd44372f7b2d542183000a':
  rtsp: Add support for depacketizing RTP data via custom IO

Conflicts:
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3f95f0dda55fca74b646937095a02a8fa9776622'
Michael Niedermayer [Fri, 4 Jan 2013 12:13:01 +0000 (13:13 +0100)]
Merge commit '3f95f0dda55fca74b646937095a02a8fa9776622'

* commit '3f95f0dda55fca74b646937095a02a8fa9776622':
  rtpdec: Move the URLContext used for RTCP RR out from the context, to a parameter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8'
Michael Niedermayer [Fri, 4 Jan 2013 12:01:54 +0000 (13:01 +0100)]
Merge commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8'

* commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8':
  aviobuf: Partial support for reading in read/write contexts
  build: Avoid detecting bogus components named 'x'

Conflicts:
libavcodec/allcodecs.c
libavdevice/alldevices.c
libavformat/allformats.c
libavformat/aviobuf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroskadec: fix ffio_init_context() usage
Michael Niedermayer [Fri, 4 Jan 2013 12:00:14 +0000 (13:00 +0100)]
matroskadec: fix ffio_init_context() usage

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/yadif: add support to named constants
Stefano Sabatini [Thu, 3 Jan 2013 00:58:15 +0000 (01:58 +0100)]
lavfi/yadif: add support to named constants

6 years agolavfi/yadif: add support to named options and options introspection
Stefano Sabatini [Wed, 2 Jan 2013 10:40:02 +0000 (11:40 +0100)]
lavfi/yadif: add support to named options and options introspection

Also rename the "enable_auto" field to "deint", to match the name of the
option.

6 years agolavfi/yadif: remove redundant NULL checks in uninit
Stefano Sabatini [Wed, 2 Jan 2013 10:19:21 +0000 (11:19 +0100)]
lavfi/yadif: remove redundant NULL checks in uninit

6 years agolavfi/yadif: fail during the configuration stage in case of invalid video size
Stefano Sabatini [Wed, 2 Jan 2013 10:17:07 +0000 (11:17 +0100)]
lavfi/yadif: fail during the configuration stage in case of invalid video size

This is better than repeatedly failing during the filtering stage.

6 years agolavfi/yadif: remove unused poll_frame callback
Stefano Sabatini [Wed, 2 Jan 2013 10:13:25 +0000 (11:13 +0100)]
lavfi/yadif: remove unused poll_frame callback

6 years agoAdd a comment about an intentional misspelling to the id3v1 tags.
Carl Eugen Hoyos [Fri, 4 Jan 2013 09:32:39 +0000 (10:32 +0100)]
Add a comment about an intentional misspelling to the id3v1 tags.

6 years agoRevert "Fix id3v1 tag spelling."
Carl Eugen Hoyos [Fri, 4 Jan 2013 09:29:31 +0000 (10:29 +0100)]
Revert "Fix id3v1 tag spelling."

The misspelling is used in the specification.

This reverts commit 95016fd1c8e1df5550d55eac1e3641970f7b38a0.

6 years agoFix id3v1 tag spelling.
Benjamin Kerensa [Fri, 4 Jan 2013 09:11:29 +0000 (10:11 +0100)]
Fix id3v1 tag spelling.

6 years agolavr: fix missing " in header documentation
Peter Meerwald [Thu, 3 Jan 2013 13:17:29 +0000 (14:17 +0100)]
lavr: fix missing " in header documentation

Signed-off-by: Peter Meerwald <p.meerwald@bct-electronic.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoac3dec: split out pointer update loop for saftey
Michael Niedermayer [Fri, 4 Jan 2013 05:09:43 +0000 (06:09 +0100)]
ac3dec: split out pointer update loop for saftey

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegaudiodec/mp3on4: fix buffer size.
Michael Niedermayer [Fri, 4 Jan 2013 04:29:57 +0000 (05:29 +0100)]
mpegaudiodec/mp3on4: fix buffer size.

The larger (and really ugly) size is not needed anymore.

Found-by: Justin Ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolocodec: flip RGBA
Michael Niedermayer [Fri, 4 Jan 2013 03:49:16 +0000 (04:49 +0100)]
locodec: flip RGBA

Fixes Ticket1222

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopngdec: fix decoding of right column for 2/4bpp
Michael Niedermayer [Thu, 3 Jan 2013 22:40:22 +0000 (23:40 +0100)]
pngdec: fix decoding of right column for 2/4bpp

Fixes Ticket1146

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoSupport more AVC-Intra files
Reimar Döffinger [Wed, 26 Sep 2012 10:13:53 +0000 (12:13 +0200)]
Support more AVC-Intra files

Followup to http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/151321
patch by Reimar and Thomas Mundt fixes some AVC-Intra files from
different tickets.
It does not fix http://samples.ffmpeg.org/ffmpeg-
bugs/trac/ticket524/AVCI50.mov

Authors of this commit are: Reimar and Thomas Mundt
Patch and commit message mostly taken from ffmpeg-devel, mail by Carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomxfdec: Set AV_FIELD_PROGRESSIVE, needed for AVC-intra
Reimar Döffinger [Thu, 3 Jan 2013 20:42:35 +0000 (21:42 +0100)]
mxfdec: Set AV_FIELD_PROGRESSIVE, needed for AVC-intra

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: update seek-lavf-aiff after previous commit
Paul B Mahol [Thu, 3 Jan 2013 20:03:43 +0000 (20:03 +0000)]
fate: update seek-lavf-aiff after previous commit

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoaiffenc: metadata support
Paul B Mahol [Sun, 30 Dec 2012 17:13:28 +0000 (17:13 +0000)]
aiffenc: metadata support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agogifdec: use log level that have more common sense
Paul B Mahol [Thu, 3 Jan 2013 19:14:40 +0000 (19:14 +0000)]
gifdec: use log level that have more common sense

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavf: add return to silence compiler warning
Michael Niedermayer [Thu, 3 Jan 2013 15:02:47 +0000 (16:02 +0100)]
lavf: add return to silence compiler warning

The added statement is not reachable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: disable globbing when calling shell functions.
Nicolas George [Wed, 2 Jan 2013 22:22:46 +0000 (23:22 +0100)]
fate: disable globbing when calling shell functions.

Some of the filters tests use globbing characters, especially
brackets for filter pad labels. While most of these strings
are way too complicated to ever match an existing file name
and are therefore kept unchanged in the command line (an old
misfeature of the shell language that happens to be convenient
here), at least one use is simple enough to match random files
lying in the current directory. If that happens, the string,
that was meant to be kept verbatim, is replaced by the file
name, and that causes the test to fail (or worse).

6 years agoaviobuf: Discard old buffered, previously read data in ffio_read_partial
Martin Storsjö [Tue, 1 Jan 2013 22:25:37 +0000 (00:25 +0200)]
aviobuf: Discard old buffered, previously read data in ffio_read_partial

This makes RTP custom IO work properly with pure read-only
AVIOContexts as well.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortsp: Add support for depacketizing RTP data via custom IO
Martin Storsjö [Tue, 1 Jan 2013 21:41:29 +0000 (23:41 +0200)]
rtsp: Add support for depacketizing RTP data via custom IO

To use this, set sdpflags=custom_io to the sdp demuxer. During
the avformat_open_input call, the SDP is read from the AVFormatContext
AVIOContext (ctx->pb) - after the avformat_open_input call,
during the av_read_frame() calls, the same ctx->pb is used for reading
packets (and sending back RTCP RR packets).

Normally, one would use this with a read-only AVIOContext for the
SDP during the avformat_open_input call, then close that one and
replace it with a read-write one for the packets after the
avformat_open_input call has returned.

This allows using the RTP depacketizers as "pure" demuxers, without
having them tied to the libavformat network IO.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpdec: Move the URLContext used for RTCP RR out from the context, to a parameter
Martin Storsjö [Wed, 17 Oct 2012 13:05:24 +0000 (16:05 +0300)]
rtpdec: Move the URLContext used for RTCP RR out from the context, to a parameter

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoaviobuf: Partial support for reading in read/write contexts
Martin Storsjö [Tue, 1 Jan 2013 20:57:36 +0000 (22:57 +0200)]
aviobuf: Partial support for reading in read/write contexts

So far, aviocontexts are used either in pure-read or pure-write
mode - full read/write mode doesn't work well (and implementing it
is a much larger, not totally trivial change).

This patch allows using avio_read and ffio_read_partial on
read/write aviocontexts, where the read operations are passed
through directly unbuffered, while writes are buffered as usual.

This is enough to support the operations needed by packet based
data transfer like in udp/rtp, where aviocontext is the only
public API for hooking up custom IO.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agobuild: Avoid detecting bogus components named 'x'
Clément Bœsch [Wed, 2 Jan 2013 05:05:55 +0000 (06:05 +0100)]
build: Avoid detecting bogus components named 'x'

The function find_things() in configure is confused by component
registration calls as part of multiline macros defining combined
component registration.  Coalesce those macros into one line to
work around the issue.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 3 Jan 2013 12:22:45 +0000 (13:22 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cmdutils: update copyright year to 2013
  h264: check SPS entries directly to detect pixel format changes
  forgotten changelogs for 9_beta2

Conflicts:
Changelog
cmdutils.c
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocmdutils: update copyright year to 2013
Johan Andersson [Tue, 1 Jan 2013 17:56:55 +0000 (18:56 +0100)]
cmdutils: update copyright year to 2013

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoh264: check SPS entries directly to detect pixel format changes
Janne Grunau [Sat, 29 Dec 2012 18:30:12 +0000 (19:30 +0100)]
h264: check SPS entries directly to detect pixel format changes

Comparing AVCodecContext.pix_fmt against the get_pixel_format() return
value has the side effect of calling the get_format() callback on each
slice. Users of the callback will probably handle hardware accelerator
initialization in the callback.

6 years agolavf/webvtt: use ff_subtitles_read_chunk().
Clément Bœsch [Thu, 3 Jan 2013 06:45:29 +0000 (07:45 +0100)]
lavf/webvtt: use ff_subtitles_read_chunk().

The FATE test is updated because the line breaks in the dialogue
rectangles are now proper CRLF.

6 years agosubviewer: sanitize packets.
Clément Bœsch [Thu, 3 Jan 2013 06:25:45 +0000 (07:25 +0100)]
subviewer: sanitize packets.

The data does not contain timing or trailing line breaks anymore. In
addition to being less idiotic, it is consistent with other codecs and
thus allows more switches between formats and codecs. It also fixes the
issue of the trailing line returns being simple \n instead of CRLF in
the ASS rectangle dialogue (this is the reason of the FATE update).

6 years agoforgotten changelogs for 9_beta2
Reinhard Tartler [Wed, 2 Jan 2013 19:16:39 +0000 (20:16 +0100)]
forgotten changelogs for 9_beta2

6 years agotiff: print error for old style LZW
Michael Niedermayer [Thu, 3 Jan 2013 03:25:55 +0000 (04:25 +0100)]
tiff: print error for old style LZW

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoReplace references to "que" with the appropriate word.
Clément Bœsch [Wed, 2 Jan 2013 23:15:16 +0000 (00:15 +0100)]
Replace references to "que" with the appropriate word.

"que" sounds like a slang word to me. This commit renames a few
variables, fix the comments and the logging messages (sometimes along
with small other typo fixes).

6 years agolavf/mpegtsenc: fix missing word in error message.
Clément Bœsch [Wed, 2 Jan 2013 23:04:41 +0000 (00:04 +0100)]
lavf/mpegtsenc: fix missing word in error message.

6 years agolavu/math: fix than/then typo, and add a comma.
Clément Bœsch [Wed, 2 Jan 2013 23:02:48 +0000 (00:02 +0100)]
lavu/math: fix than/then typo, and add a comma.

6 years agoavformat_seek_file: Dont attempt to rescale INT64_MIN/MAX
Michael Niedermayer [Wed, 2 Jan 2013 21:01:41 +0000 (22:01 +0100)]
avformat_seek_file: Dont attempt to rescale INT64_MIN/MAX

This fixes a integer overflow in fate

Reviewed-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoav_rescale: support passing MIN/MAX through
Michael Niedermayer [Wed, 2 Jan 2013 22:19:23 +0000 (23:19 +0100)]
av_rescale: support passing MIN/MAX through

Reviewed-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/faq: add -start_number example
Lou Logan [Mon, 25 Jun 2012 22:37:01 +0000 (14:37 -0800)]
doc/faq: add -start_number example

Also add example showing cat piping images to ffmpeg.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agolavu/base64: extend/clarify doxy for the base64 API
Stefano Sabatini [Tue, 1 Jan 2013 17:19:07 +0000 (18:19 +0100)]
lavu/base64: extend/clarify doxy for the base64 API

Also improve overall consistency.

6 years agolavu/eval: handle div by zero in mod().
Clément Bœsch [Wed, 2 Jan 2013 21:50:56 +0000 (22:50 +0100)]
lavu/eval: handle div by zero in mod().

Similarly to 03f5043f5, we use the FTRAPV config setting.

6 years agolavf: move stream==-1 handling from ff_subtitles_queue_seek() to avformat_seek_file()
Michael Niedermayer [Wed, 2 Jan 2013 21:55:42 +0000 (22:55 +0100)]
lavf: move stream==-1 handling from ff_subtitles_queue_seek() to avformat_seek_file()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate/sub2video: move sws flags globally in the filtergraph.
Clément Bœsch [Wed, 2 Jan 2013 20:44:43 +0000 (21:44 +0100)]
fate/sub2video: move sws flags globally in the filtergraph.

The flags are necessary for the auto inserted scaler (because the
overlay filter needs an alpha channel for the overlay surface).

6 years agofate: add missing bitexact flag to scale filter
Michael Niedermayer [Wed, 2 Jan 2013 19:15:10 +0000 (20:15 +0100)]
fate: add missing bitexact flag to scale filter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add sub2video test.
Nicolas George [Tue, 1 Jan 2013 17:51:38 +0000 (18:51 +0100)]
fate: add sub2video test.

6 years agoexamples/muxing: improve error messages.
Nicolas George [Wed, 2 Jan 2013 15:02:11 +0000 (16:02 +0100)]
examples/muxing: improve error messages.

Illustrate the use of return values, av_err2str and
avcodec_get_name.

6 years agolavfi/avfiltergraph: check pick_format return code.
Nicolas George [Wed, 2 Jan 2013 14:12:16 +0000 (15:12 +0100)]
lavfi/avfiltergraph: check pick_format return code.

6 years agodoc/muxers: adopt new -codec:SPEC syntax in segment example
Stefano Sabatini [Wed, 2 Jan 2013 11:56:12 +0000 (12:56 +0100)]
doc/muxers: adopt new -codec:SPEC syntax in segment example

6 years agodoc/muxers: add a dedicated section for segment examples
Stefano Sabatini [Wed, 2 Jan 2013 11:55:16 +0000 (12:55 +0100)]
doc/muxers: add a dedicated section for segment examples

6 years agodoc/muxers: fix typos in the segment chapter
Stefano Sabatini [Wed, 2 Jan 2013 11:53:55 +0000 (12:53 +0100)]
doc/muxers: fix typos in the segment chapter

6 years agolavf: remove generic index flag from text subtitles.
Clément Bœsch [Wed, 2 Jan 2013 09:32:21 +0000 (10:32 +0100)]
lavf: remove generic index flag from text subtitles.

This flag is not necessary.

6 years agolavf/vobsub: do not count trailing NUL char in extradata.
Clément Bœsch [Wed, 2 Jan 2013 08:31:07 +0000 (09:31 +0100)]
lavf/vobsub: do not count trailing NUL char in extradata.

See 36e61e24.

6 years agorawdec: fix NV12
Michael Niedermayer [Wed, 2 Jan 2013 02:52:54 +0000 (03:52 +0100)]
rawdec: fix NV12

Fixes Ticket646

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: check SPS entries directly to detect pixel format changes
Janne Grunau [Wed, 2 Jan 2013 01:28:34 +0000 (02:28 +0100)]
h264: check SPS entries directly to detect pixel format changes

Comparing AVCodecContext.pix_fmt against the get_pixel_format() return
value has the side effect of calling the get_format() callback on each
slice. Users of the callback will probably handle hardware accelerator
initialization in the callback.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: Fix codec id forcing with probed codecs
Michael Niedermayer [Wed, 2 Jan 2013 00:15:58 +0000 (01:15 +0100)]
lavf: Fix codec id forcing with probed codecs

Fixes Ticket2088

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: move force_codec_ids() up
Michael Niedermayer [Wed, 2 Jan 2013 00:15:06 +0000 (01:15 +0100)]
lavf: move force_codec_ids() up

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: merge mapchan and options into ffmpeg.
Nicolas George [Tue, 1 Jan 2013 17:20:55 +0000 (18:20 +0100)]
fate: merge mapchan and options into ffmpeg.

They were two very short files that cover ffmpeg-specific features.

6 years agoffmpeg: sub2video: set resample size.
Nicolas George [Tue, 1 Jan 2013 16:25:04 +0000 (17:25 +0100)]
ffmpeg: sub2video: set resample size.

Necessary after 04a530f.

6 years agolavc/dvdsubenc: improve color distance function.
Nicolas George [Tue, 1 Jan 2013 16:06:04 +0000 (17:06 +0100)]
lavc/dvdsubenc: improve color distance function.

Consider the color space as an hypercone with apex alpha=0
and base alpha=1 instead of an hypercube.
Make the encoder consider very transparent colors more similar
even if the hue is very different.
This corresponds roughly to using the alpha as a weight for the
color difference.
Only 4 bits of alpha are used, because this is what dvdsub uses,
and it avoids overflows.

Fix trac ticket #2005.

6 years agolavf/matroskaenc: respect bitexact for attachments.
Nicolas George [Tue, 1 Jan 2013 13:14:43 +0000 (14:14 +0100)]
lavf/matroskaenc: respect bitexact for attachments.

Use the first 64 bits of the SHA1 of the content as file UID
instead of a random number if the bitexact flag is set.

6 years agoffmpeg: apply flags to attachments too.
Nicolas George [Tue, 1 Jan 2013 11:51:14 +0000 (12:51 +0100)]
ffmpeg: apply flags to attachments too.

6 years agoffmpeg: move stream_copy flags handling after attachments.
Nicolas George [Tue, 1 Jan 2013 11:49:55 +0000 (12:49 +0100)]
ffmpeg: move stream_copy flags handling after attachments.

6 years agobetter filter error message when accidentally reusing outputs
rogerdpack [Fri, 28 Dec 2012 18:48:48 +0000 (11:48 -0700)]
better filter error message when accidentally reusing outputs

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: add data: URI scheme.
Nicolas George [Wed, 26 Dec 2012 19:26:08 +0000 (20:26 +0100)]
lavf: add data: URI scheme.

6 years agolavfi/lut: use ff_fill_rgba_map()
Paul B Mahol [Tue, 1 Jan 2013 16:38:54 +0000 (16:38 +0000)]
lavfi/lut: use ff_fill_rgba_map()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoaiffdec: set block duration for QDM2
Piotr Bandurski [Tue, 1 Jan 2013 16:57:01 +0000 (16:57 +0000)]
aiffdec: set block duration for QDM2

Fixes #1697.

6 years agolavc/movtextdec: keep the min size instead of max to fix overread.
Clément Bœsch [Tue, 1 Jan 2013 15:41:37 +0000 (16:41 +0100)]
lavc/movtextdec: keep the min size instead of max to fix overread.

Fixes Ticket #2087.

6 years agofate: re-enable fate-sub-mpsub.
Clément Bœsch [Tue, 1 Jan 2013 15:34:00 +0000 (16:34 +0100)]
fate: re-enable fate-sub-mpsub.

This reverts commit 580ee973d16cb5afb3d5974133576d6c570d2dda.

6 years agolavf/mov: fix timecode track reference usage.
Clément Bœsch [Tue, 1 Jan 2013 15:15:39 +0000 (16:15 +0100)]
lavf/mov: fix timecode track reference usage.

6 years agolavf/mov: simplify timecode track ref.
Clément Bœsch [Tue, 1 Jan 2013 14:42:33 +0000 (15:42 +0100)]
lavf/mov: simplify timecode track ref.

There can be only one track reference. The multiple tref handling is
handled at a different level.

6 years agoffmpeg: mark attachment streams finished.
Nicolas George [Tue, 1 Jan 2013 00:23:19 +0000 (01:23 +0100)]
ffmpeg: mark attachment streams finished.

Fix trac ticket #2083.

6 years agocmdutils: we have 2013
Michael Niedermayer [Tue, 1 Jan 2013 14:43:09 +0000 (15:43 +0100)]
cmdutils: we have 2013

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: merge all filtering code into ff_filter_frame.
Nicolas George [Sun, 30 Dec 2012 18:28:51 +0000 (19:28 +0100)]
lavfi: merge all filtering code into ff_filter_frame.

6 years agomov: fix parsing of the chap atom.
Hendrik Leppkes [Sun, 15 Jul 2012 08:58:27 +0000 (10:58 +0200)]
mov: fix parsing of the chap atom.

This was broken in 0d96ec19ebc1577b27a889136364a906e1c627b1 under the
assumption that there is only one tref leaf atom.

Fixes Ticket #2081.

6 years agofate: add nistsphere demuxer test
Paul B Mahol [Sun, 30 Dec 2012 18:08:29 +0000 (18:08 +0000)]
fate: add nistsphere demuxer test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 1 Jan 2013 13:04:50 +0000 (14:04 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmp: Add support for limelight authentication
  rtmp: Add support for adobe authentication

Conflicts:
Changelog
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/avcodec: fix typo
Paul B Mahol [Tue, 1 Jan 2013 12:55:27 +0000 (12:55 +0000)]
lavfi/avcodec: fix typo

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge commit '33f28a3be3092f642778253d9529dd66fe2a014a'
Michael Niedermayer [Tue, 1 Jan 2013 12:54:12 +0000 (13:54 +0100)]
Merge commit '33f28a3be3092f642778253d9529dd66fe2a014a'

* commit '33f28a3be3092f642778253d9529dd66fe2a014a':
  rtmp: Add a function for writing AMF strings based on two substrings
  rtmp: Return a proper error code in handle_invoke_error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffprobe: do not escape '"' between single quotes.
Clément Bœsch [Tue, 1 Jan 2013 12:30:42 +0000 (13:30 +0100)]
ffprobe: do not escape '"' between single quotes.

6 years agodoc/resampler: remove .html from link text.
Clément Bœsch [Tue, 1 Jan 2013 09:59:51 +0000 (10:59 +0100)]
doc/resampler: remove .html from link text.

6 years agoffmpeg: avoid negative timestamps for DVD
Michael Niedermayer [Tue, 1 Jan 2013 03:59:03 +0000 (04:59 +0100)]
ffmpeg: avoid negative timestamps for DVD

dvdauthor cannot handle files with ts wraps

Fixes ticket383

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