ffmpeg.git
9 years agolavfi: add audio eval signal source
Stefano Sabatini [Thu, 18 Aug 2011 23:51:26 +0000 (01:51 +0200)]
lavfi: add audio eval signal source

9 years agoffprobe: prefer av_strtok() over av_get_token() for parsing print_format string
Stefano Sabatini [Fri, 14 Oct 2011 22:38:29 +0000 (00:38 +0200)]
ffprobe: prefer av_strtok() over av_get_token() for parsing print_format string

Simplify, and avoid the need for multiple escaping levels.

9 years agolavu: add av_strtok()
Stefano Sabatini [Fri, 14 Oct 2011 22:14:37 +0000 (00:14 +0200)]
lavu: add av_strtok()

The function strtok_r() is part of the POSIX.1 specification, but is not
available on some platforms. We provide an internal implementation, so we
do not need to rely on a platform implementation.

9 years agoffprobe: move up ESCAPE_CHECK_SIZE and ESCAPE_REALLOC_BUF macros
Stefano Sabatini [Fri, 14 Oct 2011 14:50:30 +0000 (16:50 +0200)]
ffprobe: move up ESCAPE_CHECK_SIZE and ESCAPE_REALLOC_BUF macros

So they can be used by other escaping routines.

9 years agoffprobe: redesign json_escape_str(), to make use of a global buffer
Stefano Sabatini [Fri, 14 Oct 2011 13:17:48 +0000 (15:17 +0200)]
ffprobe: redesign json_escape_str(), to make use of a global buffer

The new code avoids to call av_malloc/av_free when escaping is needed
(possibly faster), avoids an integer overflow in case of a huge
string, and provides feedback when a string cannot be escaped.

When a string cannot be escaped, a special string is printed instead.

9 years agoflv: Initialize initial frame to 16
Michael Niedermayer [Tue, 18 Oct 2011 12:56:59 +0000 (14:56 +0200)]
flv: Initialize initial frame to 16
Fixes Ticket563

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agompeg12_parser: make mpegvideo_split() more robust
Michael Niedermayer [Tue, 18 Oct 2011 12:08:06 +0000 (14:08 +0200)]
mpeg12_parser: make mpegvideo_split() more robust
I just found this issue while debuging, i dont have a testcase.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agompeg12dec: dont consider parsing extradata as having achived sync.
Michael Niedermayer [Tue, 18 Oct 2011 11:56:29 +0000 (13:56 +0200)]
mpeg12dec: dont consider parsing extradata as having achived sync.
Fixes Ticket67

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agofix memleak in packet corrupt dropping code
Chris Kennedy [Tue, 18 Oct 2011 10:00:48 +0000 (12:00 +0200)]
fix memleak in packet corrupt dropping code

9 years agoavidec: Dont switch to NI mode if there is no index.
Michael Niedermayer [Tue, 18 Oct 2011 01:20:19 +0000 (03:20 +0200)]
avidec: Dont switch to NI mode if there is no index.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoDo not try to parse empty strf tags.
Carl Eugen Hoyos [Tue, 18 Oct 2011 01:29:41 +0000 (03:29 +0200)]
Do not try to parse empty strf tags.

9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 17 Oct 2011 23:33:09 +0000 (01:33 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: add presets
  rtsp: Expose the flag options via private AVOptions for sdp and rtp, too
  rtsp: Make the rtsp flags avoptions set via a define
  rtpenc: Set a default video codec
  avoptions: Fix av_opt_flag_is_set
  rtp: Fix ff_rtp_get_payload_type
  doc: Update the documentation on setting options for RTSP
  rtsp: Remove the separate filter_source variable
  rtsp: Accept options via private avoptions instead of URL options
  rtsp: Simplify AVOption definitions
  rtsp: Merge the AVOption lists
  lavfi: port libmpcodecs delogo filter
  lavfi: port boxblur filter from libmpcodecs
  lavfi: add negate filter
  lavfi: add LUT (LookUp Table) generic filters
  AVOptions: don't segfault on NULL parameter in av_set_options_string()
  avio: Check for invalid buffer length.
  mpegenc/mpegtsenc: add muxrate private options.
  lavf: deprecate AVFormatContext.file_size
  mov: add support for TV metadata atoms tves, tvsn and stik

Conflicts:
Changelog
doc/filters.texi
doc/protocols.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/avfilter.h
libavfilter/formats.c
libavfilter/internal.h
libavfilter/vf_boxblur.c
libavfilter/vf_delogo.c
libavfilter/vf_lut.c
libavformat/mpegtsenc.c
libavformat/utils.c
libavformat/version.h
libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agochangelog: libutvideo wrapper
Compn [Mon, 17 Oct 2011 23:12:48 +0000 (19:12 -0400)]
changelog: libutvideo wrapper
http://umezawa.dyndns.info/archive/utvideo/

9 years agolibutvideo: Add Ut Video Decoder Wrapper
Derek Buitenhuis [Mon, 17 Oct 2011 00:22:59 +0000 (20:22 -0400)]
libutvideo: Add Ut Video Decoder Wrapper

Add a wrapper for libutvideo's decoder.

This supports decoding the following FOURCCs:
    ULY0 - 4:2:0 YCbCr
    ULY2 - 4:2:2 YCbCr
    ULRG - RGB
    ULRA - RGBA

Also, bump version.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoparseutils: fix various cast qualifier warnings.
Michael Niedermayer [Mon, 17 Oct 2011 20:57:48 +0000 (22:57 +0200)]
parseutils: fix various cast qualifier warnings.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodict: fix assignment discards qualifiers from pointer target type warnings.
Michael Niedermayer [Mon, 17 Oct 2011 20:56:13 +0000 (22:56 +0200)]
dict: fix assignment discards qualifiers from pointer target type warnings.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavstring: fix return discards qualifiers from pointer target type.
Michael Niedermayer [Mon, 17 Oct 2011 20:55:00 +0000 (22:55 +0200)]
avstring: fix return discards qualifiers from pointer target type.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavconv: add presets
Alexandra Khirnova [Mon, 10 Oct 2011 10:52:13 +0000 (11:52 +0100)]
avconv: add presets

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agortsp: Expose the flag options via private AVOptions for sdp and rtp, too
Martin Storsjö [Mon, 17 Oct 2011 17:07:56 +0000 (20:07 +0300)]
rtsp: Expose the flag options via private AVOptions for sdp and rtp, too

This allows setting the filter_src option for these demuxers, too,
which wasn't possible at all before (where the option only was set
via URL parameters for RTSP).

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agortsp: Make the rtsp flags avoptions set via a define
Martin Storsjö [Mon, 17 Oct 2011 17:04:41 +0000 (20:04 +0300)]
rtsp: Make the rtsp flags avoptions set via a define

This helps sharing these options with the sdp and rtp demuxers.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agortpenc: Set a default video codec
Martin Storsjö [Mon, 17 Oct 2011 18:11:07 +0000 (21:11 +0300)]
rtpenc: Set a default video codec

avconv doesn't map video streams to a muxer without specifying a
manual stream mapping if the default video codec is CODEC_ID_NONE.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoexamples/decoding_encoding.c: test mpeg1 and h264
Michael Niedermayer [Mon, 17 Oct 2011 18:36:03 +0000 (20:36 +0200)]
examples/decoding_encoding.c: test mpeg1 and h264

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavoptions: Fix av_opt_flag_is_set
Martin Storsjö [Mon, 17 Oct 2011 17:50:02 +0000 (20:50 +0300)]
avoptions: Fix av_opt_flag_is_set

With the changes in 3b3ea34655db02d9cd9ea1a4122e920a7fdec602,
"Remove all uses of deprecated AVOptions API", av_opt_flag_is_set
was broken, since it now uses av_opt_find, which doesn't return
named constants unless a unit to look for the constant in is given.

This broke enabling LATM encapsulated AAC output in RTP.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoexamples/decoding_encoding.c: silence compiler warning
Michael Niedermayer [Mon, 17 Oct 2011 18:23:24 +0000 (20:23 +0200)]
examples/decoding_encoding.c: silence compiler warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoexamples/decoding_encoding.c: set a codec private option to demonstrate how to do...
Michael Niedermayer [Mon, 17 Oct 2011 18:22:45 +0000 (20:22 +0200)]
examples/decoding_encoding.c: set a codec private option to demonstrate how to do that

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoexamples/decoding_encoding.c: switch to h264
Michael Niedermayer [Mon, 17 Oct 2011 18:22:07 +0000 (20:22 +0200)]
examples/decoding_encoding.c: switch to h264

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agortp: Fix ff_rtp_get_payload_type
Martin Storsjö [Mon, 17 Oct 2011 17:24:54 +0000 (20:24 +0300)]
rtp: Fix ff_rtp_get_payload_type

It was broken in 3b3ea34655db02d9cd9ea1a4122e920a7fdec602
"Remove all uses of deprecated AVOptions API", where any
presence of a payload_type AVOption caused its value to
be returned, even if it wasn't set (and thus had the default
-1 value).

This caused the RTP muxer to be broken.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agodoc: Update the documentation on setting options for RTSP
Martin Storsjö [Wed, 12 Oct 2011 15:27:18 +0000 (18:27 +0300)]
doc: Update the documentation on setting options for RTSP

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agortsp: Remove the separate filter_source variable
Martin Storsjö [Thu, 23 Jun 2011 22:55:00 +0000 (01:55 +0300)]
rtsp: Remove the separate filter_source variable

Read it as a flag from the flags field instead.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agortsp: Accept options via private avoptions instead of URL options
Martin Storsjö [Thu, 23 Jun 2011 22:49:09 +0000 (01:49 +0300)]
rtsp: Accept options via private avoptions instead of URL options

Eventually, the old way of passing options by adding
stuff to the URL can be dropped.

This avoids having to tamper with the user-specified URL to
pass options on the transport mode. This also works better
with redirects, since the options don't need to be parsed out
from the URL.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agortsp: Simplify AVOption definitions
Martin Storsjö [Thu, 13 Oct 2011 11:00:06 +0000 (14:00 +0300)]
rtsp: Simplify AVOption definitions

Use defines for shortening common parts, omit the .dbl named
initializer (since it's the first element in the union).

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agortsp: Merge the AVOption lists
Martin Storsjö [Thu, 23 Jun 2011 23:04:54 +0000 (02:04 +0300)]
rtsp: Merge the AVOption lists

This eases adding options that are common for both. The
AV_OPT_FLAG_EN/DECODING_PARAM still indicates whether they belong
to the muxer or demuxer.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agolavfi: port libmpcodecs delogo filter
Stefano Sabatini [Wed, 10 Aug 2011 16:58:49 +0000 (18:58 +0200)]
lavfi: port libmpcodecs delogo filter

The ported filter supports named option parsing and more YUV formats.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agolavfi: port boxblur filter from libmpcodecs
Stefano Sabatini [Sat, 9 Jul 2011 16:13:10 +0000 (18:13 +0200)]
lavfi: port boxblur filter from libmpcodecs

With the following additions:
* support to gray format
* support to yuva420p format
* parametric luma/chroma/alpha radius
* consistency check on the radius values, avoid crashes with invalid values

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agolavfi: add negate filter
Stefano Sabatini [Sat, 28 May 2011 20:00:26 +0000 (22:00 +0200)]
lavfi: add negate filter

This filter is a simple wrapper around the LUT filter.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agolavfi: add LUT (LookUp Table) generic filters
Stefano Sabatini [Sat, 28 May 2011 19:51:03 +0000 (21:51 +0200)]
lavfi: add LUT (LookUp Table) generic filters

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agosegmenter: loose rindex()
Michael Niedermayer [Mon, 17 Oct 2011 14:51:48 +0000 (16:51 +0200)]
segmenter: loose rindex()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agompeg4parser: fix initial qp precission
Michael Niedermayer [Mon, 17 Oct 2011 11:01:23 +0000 (13:01 +0200)]
mpeg4parser: fix initial qp precission

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoAVOptions: don't segfault on NULL parameter in av_set_options_string()
Anton Khirnov [Sat, 1 Oct 2011 12:42:53 +0000 (14:42 +0200)]
AVOptions: don't segfault on NULL parameter in av_set_options_string()

9 years agompeg12: use drop_frame_flag to fix timecode debug format.
Clément Bœsch [Wed, 12 Oct 2011 15:06:18 +0000 (17:06 +0200)]
mpeg12: use drop_frame_flag to fix timecode debug format.

9 years agoavio: Check for invalid buffer length.
Alex Converse [Sat, 15 Oct 2011 01:27:59 +0000 (18:27 -0700)]
avio: Check for invalid buffer length.

9 years agompegenc/mpegtsenc: add muxrate private options.
Anton Khirnov [Sun, 9 Oct 2011 12:40:11 +0000 (14:40 +0200)]
mpegenc/mpegtsenc: add muxrate private options.

Deprecate AVFormatContext.mux_rate.

9 years agolavf: deprecate AVFormatContext.file_size
Anton Khirnov [Sun, 9 Oct 2011 12:12:14 +0000 (14:12 +0200)]
lavf: deprecate AVFormatContext.file_size

It's too unreliable to be useful. avio_size() should be called instead.

9 years agomov: add support for TV metadata atoms tves, tvsn and stik
Raivo Hool [Fri, 14 Oct 2011 17:14:18 +0000 (20:14 +0300)]
mov: add support for TV metadata atoms tves, tvsn and stik

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoAVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*.
Clément Bœsch [Mon, 17 Oct 2011 05:33:10 +0000 (07:33 +0200)]
AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*.

9 years agosegment: Fix typo in segment_basename
Michael Niedermayer [Mon, 17 Oct 2011 01:36:56 +0000 (03:36 +0200)]
segment: Fix typo in segment_basename

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agosegment: replace strdup() by av_strdup()
Michael Niedermayer [Mon, 17 Oct 2011 01:36:22 +0000 (03:36 +0200)]
segment: replace strdup() by av_strdup()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'luzero/segment'
Michael Niedermayer [Mon, 17 Oct 2011 01:38:27 +0000 (03:38 +0200)]
Merge remote-tracking branch 'luzero/segment'

* luzero/segment:
  segment: extend options
  segment: basic pattern support and playlist output
  segment: introduce segmented chain muxer
  output-example: extend duration
  ratecontrol: estimate twice the qscale values

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 17 Oct 2011 00:29:40 +0000 (02:29 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  w32threads: support for frame multithreading
  avcodec: remove stray @deprecated comment

Conflicts:
libavcodec/utils.c
libavcodec/w32thread.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sun, 16 Oct 2011 21:42:06 +0000 (23:42 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: avoid window resize crash on osx with libsdl 1.2.14
  ffplay: add delay multiple times to frame_timer if it is less than current time
  ffplay: remove early frame drop functionality
  ffplay: calculate target clock dynamically, make code more readable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoav_tempfile: dont try the current directory with mkstemp() unless we are on windows
Michael Niedermayer [Sun, 16 Oct 2011 20:32:41 +0000 (22:32 +0200)]
av_tempfile: dont try the current directory with mkstemp() unless we are on windows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoav_tempfile: change mode for fallback to 0600 to match mkstemp()
Michael Niedermayer [Sun, 16 Oct 2011 20:13:20 +0000 (22:13 +0200)]
av_tempfile: change mode for fallback to 0600 to match mkstemp()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoav_tempfile: Pass int log_offset, void *log_ctx
Michael Niedermayer [Sun, 16 Oct 2011 19:32:06 +0000 (21:32 +0200)]
av_tempfile: Pass int log_offset, void *log_ctx

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoav_tempfile: fix error codes
Michael Niedermayer [Sun, 16 Oct 2011 19:27:20 +0000 (21:27 +0200)]
av_tempfile: fix error codes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoav_tempfile: use O_EXCL
Michael Niedermayer [Sun, 16 Oct 2011 19:25:07 +0000 (21:25 +0200)]
av_tempfile: use O_EXCL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoav_tempfile: try tempnam(NULL) first
Michael Niedermayer [Sun, 16 Oct 2011 19:24:12 +0000 (21:24 +0200)]
av_tempfile: try tempnam(NULL) first

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agocache: add todo list
Michael Niedermayer [Sun, 16 Oct 2011 15:31:33 +0000 (17:31 +0200)]
cache: add todo list

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agow32threads: support for frame multithreading
Steven Walters [Sun, 9 Oct 2011 19:38:35 +0000 (21:38 +0200)]
w32threads: support for frame multithreading

Replace our incomplete w32threads implementation with x264's pthreads
w32threads wrapper.
Relicensed to LGPL with kind permission by Pegasys Inc.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agolavd/lavfi: compute and use the used samples buffer size for the output audio packet...
Stefano Sabatini [Sun, 16 Oct 2011 08:35:07 +0000 (10:35 +0200)]
lavd/lavfi: compute and use the used samples buffer size for the output audio packet size

Do not assume the used size is the same of the allocated size, as it was
wrongly assumed. Fix audio playback when the two values differ.

9 years agoffplay: avoid window resize crash on osx with libsdl 1.2.14
Jean First [Wed, 12 Oct 2011 19:54:33 +0000 (21:54 +0200)]
ffplay: avoid window resize crash on osx with libsdl 1.2.14

Signed-off-by: Marton Balint <cus@passwd.hu>
9 years agoffplay: add delay multiple times to frame_timer if it is less than current time
Marton Balint [Sun, 9 Oct 2011 14:52:28 +0000 (16:52 +0200)]
ffplay: add delay multiple times to frame_timer if it is less than current time

If the picture queue is empty, or when the calculated delay is 0, frame_timer
is not increased but we are still displaying the old frame. When we eventually
get a frame, where the computed delay is positive, so we don't need to drop any
more frames, then it is best to update frame_timer to be as near as the current
time as it can.

This way we dont't have to wait several frames to add the necesarry delays to
frame_timer to reach current time, therefore there are no extra frame drops
after reaching a positive delay.

Signed-off-by: Marton Balint <cus@passwd.hu>
9 years agoffplay: remove early frame drop functionality
Marton Balint [Sun, 9 Oct 2011 13:49:22 +0000 (15:49 +0200)]
ffplay: remove early frame drop functionality

The current impementation of early frame drops (dropping frames before adding
them to the picture queue) has multiple problems:

Even after gettin A-V sync, the frame droping continues until
VideoState->skip_frames reaches 1, which can take a lot of time causing useless
additional frame drops and bad AV-sync. This issue can be easily triggered with
for example changing the audio stream.

Also video_refresh currenly does not handle early skipped frames in every case,
for example if we skip a frame, then the last frame duration calculation will
compute the duration of the sum of the skipped frame and the duration of the
frame before that, and in compute_target_delay we may multiply this unusually
big delay.

Signed-off-by: Marton Balint <cus@passwd.hu>
9 years agoffplay: calculate target clock dynamically, make code more readable
Marton Balint [Sat, 8 Oct 2011 19:38:53 +0000 (21:38 +0200)]
ffplay: calculate target clock dynamically, make code more readable

Since target clock is based on the current A-V delay, it is better calculate it
when we actually need it rather than when we put a picture in the picture
queue.

The patch also makes a code a bit more readable by renaming some delay
variables to duration, and converting compute_target_time to a delay
calculating function which does not modify the state. Factoring out the
iteration of the pictq to standalone function is also done in this patch.

Signed-off-by: Marton Balint <cus@passwd.hu>
9 years agoAllow to overwrite input stream tags.
Carl Eugen Hoyos [Sun, 16 Oct 2011 17:05:11 +0000 (19:05 +0200)]
Allow to overwrite input stream tags.

9 years agoavcodec: remove stray @deprecated comment
Mans Rullgard [Sun, 16 Oct 2011 15:16:55 +0000 (16:16 +0100)]
avcodec: remove stray @deprecated comment

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agocache: Fallback to using the cache size for AVSEEK_SIZE if the underlaying protocol...
Michael Niedermayer [Sun, 16 Oct 2011 14:54:27 +0000 (16:54 +0200)]
cache: Fallback to using the cache size for AVSEEK_SIZE if the underlaying protocol has nothing better.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoadd cache protocol
Michael Niedermayer [Sun, 16 Oct 2011 14:02:35 +0000 (16:02 +0200)]
add cache protocol
This allows backward seeking on top of some non seekable streams.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoav_tempfile: handle missing O_BINARY
Michael Niedermayer [Sun, 16 Oct 2011 13:44:31 +0000 (15:44 +0200)]
av_tempfile: handle missing O_BINARY

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoav_tempfile: fix alloc type for !HAVE_MKSTEMP
Michael Niedermayer [Sun, 16 Oct 2011 13:42:18 +0000 (15:42 +0200)]
av_tempfile: fix alloc type for !HAVE_MKSTEMP

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMove av_tempfile() into libavutil, it is a generically usefull thing and its small.
Michael Niedermayer [Sun, 16 Oct 2011 13:21:58 +0000 (15:21 +0200)]
Move av_tempfile() into libavutil, it is a generically usefull thing and its small.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoDo not warn about wrong channel layout if no channel layout is defined.
Carl Eugen Hoyos [Sun, 16 Oct 2011 15:12:53 +0000 (17:12 +0200)]
Do not warn about wrong channel layout if no channel layout is defined.

9 years agoSupport decoding ASP variant from QNAP Systems.
Carl Eugen Hoyos [Sun, 16 Oct 2011 08:30:24 +0000 (10:30 +0200)]
Support decoding ASP variant from QNAP Systems.

Fixes part of ticket #560.

9 years agoasf: export all the DRM stuff, some of it are human readable strings.
Michael Niedermayer [Sun, 16 Oct 2011 03:04:48 +0000 (05:04 +0200)]
asf: export all the DRM stuff, some of it are human readable strings.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoasf: dont warn the user about digital sigantures, they should on their own not cause...
Michael Niedermayer [Sun, 16 Oct 2011 02:44:42 +0000 (04:44 +0200)]
asf: dont warn the user about digital sigantures, they should on their own not cause failure.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoasf: export encryption information from asf.
Michael Niedermayer [Sun, 16 Oct 2011 02:41:11 +0000 (04:41 +0200)]
asf: export encryption information from asf.
This way user apps can choose to skip such content.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 16 Oct 2011 01:44:00 +0000 (03:44 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  prores: get correct size for coded V plane if alpha is present
  prores: do not set pixel format on codec init
  pthread: prevent updating AVCodecContext from itself in frame_thread_free
  pthread: copy coded frame dimensions in update_context_from_thread
  vp8: prevent read from uninitialized memory in decode_mvs
  vp8: force reallocation in update_thread_context after frame size change
  vp8: fix return value if update_dimensions fails
  matroskadec: fix out of bounds write
  adpcmdec: calculate actual number of output samples for each decoder.
  adpcmdec: check remaining buffer size before decoding next block in the ADPCM IMA WAV decoder.
  adpcmdec: do not terminate early in ADPCM IMA Duck DK3 decoder.
  adpcmdec: remove unneeded buf_size==0 check.
  adpcmdec: remove unneeded zeroing of *data_size
  dnxhdenc: fixed signed multiplication overflow

Conflicts:
tests/ref/fate/prores-alpha
tests/ref/fate/truemotion1-24

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agobit: require at least 1 frame for probing
Michael Niedermayer [Sun, 16 Oct 2011 00:43:36 +0000 (02:43 +0200)]
bit: require at least 1 frame for probing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoidf: Improve idf_probe() so it doesnt succeed on 0 byte input
Michael Niedermayer [Sun, 16 Oct 2011 00:38:02 +0000 (02:38 +0200)]
idf: Improve idf_probe() so it doesnt succeed on 0 byte input

9 years agodvbsubdec: cosmetic change on how xpos is passed around
JULIAN GARDNER [Fri, 14 Oct 2011 12:36:56 +0000 (14:36 +0200)]
dvbsubdec: cosmetic change on how xpos is passed around

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoaf_ashowinfo: fix plane size computation for planar layout formats
Stefano Sabatini [Sat, 15 Oct 2011 23:49:20 +0000 (01:49 +0200)]
af_ashowinfo: fix plane size computation for planar layout formats

+10l.

9 years agoaf_aresample: fix properties setting in the output buffer
Stefano Sabatini [Fri, 16 Sep 2011 23:30:15 +0000 (01:30 +0200)]
af_aresample: fix properties setting in the output buffer

In particular: set output timebase to 1/output_sample_rate, fix output
PTS computation, and do not forget to copy properties values from the
input buffer.

9 years agoaf_ashowinfo: adopt used plane size when computing the plane checksum
Stefano Sabatini [Sat, 15 Oct 2011 22:44:22 +0000 (00:44 +0200)]
af_ashowinfo: adopt used plane size when computing the plane checksum

Fix checksum computation when the used plane size is different from the
allocated plane size, as it was wrongly assumed.

9 years agodvbsubdec: Fix 0xf0 end detection
Michael Niedermayer [Sat, 15 Oct 2011 19:28:43 +0000 (21:28 +0200)]
dvbsubdec: Fix 0xf0 end detection
Based on a change by JULIAN GARDNER

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodvbsub: add comments
JULIAN GARDNER [Sat, 15 Oct 2011 18:30:54 +0000 (20:30 +0200)]
dvbsub: add comments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodvbsub: add dvb_encode_rle8()
JULIAN GARDNER [Sat, 15 Oct 2011 18:30:18 +0000 (20:30 +0200)]
dvbsub: add dvb_encode_rle8()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodvbsub: Move setting of *dvb_encode_rle() up
JULIAN GARDNER [Sat, 15 Oct 2011 18:28:51 +0000 (20:28 +0200)]
dvbsub: Move setting of *dvb_encode_rle() up

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodvbsubdec:dvbsub_display_end_segment() move main loop under if() as its useless if...
JULIAN GARDNER [Sat, 15 Oct 2011 18:16:31 +0000 (20:16 +0200)]
dvbsubdec:dvbsub_display_end_segment() move main loop under if() as its useless if false.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoSupport H264 from QNAP Systems.
Carl Eugen Hoyos [Sat, 15 Oct 2011 16:28:32 +0000 (18:28 +0200)]
Support H264 from QNAP Systems.

9 years agoprores: get correct size for coded V plane if alpha is present
Mans Rullgard [Sat, 15 Oct 2011 13:35:49 +0000 (14:35 +0100)]
prores: get correct size for coded V plane if alpha is present

The size check must be updated to take into account both manners
in which v_data_size might be set.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoprores: do not set pixel format on codec init
Mans Rullgard [Sat, 15 Oct 2011 13:35:10 +0000 (14:35 +0100)]
prores: do not set pixel format on codec init

The pixel format is not known until the frame header is parsed.
Guessing it here only causes trouble for the caller if the guess
turns out to be wrong (and actually causes very wrong output by
avconv/avplay).

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoh264: Workaround invalid flag combinations of 8x8 inference.
Michael Niedermayer [Sat, 15 Oct 2011 13:32:34 +0000 (15:32 +0200)]
h264: Workaround invalid flag combinations of 8x8 inference.
Fixes Ticket555

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffprobe: add AVClass to writers
Stefano Sabatini [Fri, 14 Oct 2011 13:13:20 +0000 (15:13 +0200)]
ffprobe: add AVClass to writers

It is useful for logging messages from a writer context.

9 years agopthread: prevent updating AVCodecContext from itself in frame_thread_free
Ronald S. Bultje [Fri, 14 Oct 2011 21:47:45 +0000 (23:47 +0200)]
pthread: prevent updating AVCodecContext from itself in frame_thread_free

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agopthread: copy coded frame dimensions in update_context_from_thread
Ronald S. Bultje [Fri, 14 Oct 2011 21:46:06 +0000 (23:46 +0200)]
pthread: copy coded frame dimensions in update_context_from_thread

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agovp8: prevent read from uninitialized memory in decode_mvs
Ronald S. Bultje [Fri, 14 Oct 2011 21:43:29 +0000 (23:43 +0200)]
vp8: prevent read from uninitialized memory in decode_mvs

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agovp8: force reallocation in update_thread_context after frame size change
Ronald S. Bultje [Fri, 14 Oct 2011 21:27:52 +0000 (23:27 +0200)]
vp8: force reallocation in update_thread_context after frame size change

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agovp8: fix return value if update_dimensions fails
Ronald S. Bultje [Fri, 14 Oct 2011 21:21:46 +0000 (23:21 +0200)]
vp8: fix return value if update_dimensions fails

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agomatroskadec: fix out of bounds write
Ronald S. Bultje [Fri, 14 Oct 2011 22:03:55 +0000 (00:03 +0200)]
matroskadec: fix out of bounds write

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 14 Oct 2011 19:56:46 +0000 (21:56 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  proresdsp: fix function prototypes.
  prores-idct: fix overflow in c code.
  fate: update prores-alpha ref after changing pix_fmt to yuv444p10le
  prores: add missing feature warning for alpha
  mov: 10l: Terminate string with 0 not '0'
  mov: Prevent illegal writes when chapter titles are very short.
  prores: add appropriate -fix_fmt parameter to FATE command
  riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header
  lavc: add a flag-based error_recognition field to AVCodecContext and deprecate non-flag-based ER field
  lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ER

Conflicts:
libavcodec/avcodec.h
libavformat/mov.c
tests/fate/prores.mak
tests/ref/acodec/g726
tests/ref/fate/prores-alpha

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoadpcmdec: calculate actual number of output samples for each decoder.
Justin Ruggles [Sun, 2 Oct 2011 14:18:17 +0000 (10:18 -0400)]
adpcmdec: calculate actual number of output samples for each decoder.

This also allows for removing some of the buf_size checks and using the
sample count for some of the decoding loops.