ffmpeg.git
8 years agopngenc: write sample aspect ratio
Paul B Mahol [Sat, 13 Oct 2012 09:26:09 +0000 (09:26 +0000)]
pngenc: write sample aspect ratio

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agopngdec: read sample aspect ratio
Paul B Mahol [Sat, 13 Oct 2012 08:38:02 +0000 (08:38 +0000)]
pngdec: read sample aspect ratio

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 13 Oct 2012 15:09:13 +0000 (17:09 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vc1: Use codec ID from AVCodecContext while parsing frame header
  avplay: support mid-stream sample rate changes

Conflicts:
ffplay.c
libavcodec/vc1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffplay: use audio parameters from the decoded frame instead of AVCodecContext
Michael Niedermayer [Sat, 13 Oct 2012 14:45:01 +0000 (16:45 +0200)]
ffplay: use audio parameters from the decoded frame instead of AVCodecContext

Based on commit by Justin Ruggles (the changed code is too different to apply as is)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609'
Michael Niedermayer [Sat, 13 Oct 2012 14:39:42 +0000 (16:39 +0200)]
Merge commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609'

* commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609':
  avplay: use audio parameters from the decoded frame instead of AVCodecContext
  dca: allocate a secondary buffer for extra channels when downmixing
  configure: use utilities from /usr/xpg4/bin if it exists
  avstring-test: fix memory leaks

Conflicts:
ffplay.c
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosmjpegdec: use url_feof()
Paul B Mahol [Sat, 13 Oct 2012 14:09:20 +0000 (14:09 +0000)]
smjpegdec: use url_feof()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoMerge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723'
Michael Niedermayer [Sat, 13 Oct 2012 13:42:49 +0000 (15:42 +0200)]
Merge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723'

* commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723':
  rtpdec_xiph: fix function return type
  smjpeg: fix type of 'ret' variable in smjpeg_read_packet()
  mpegvideo: remove write-only variable
  Use proper return values in case of missing features
  fate: add avstring test
  rangecoder-test: Set error message log level to error, instead of debug

Conflicts:
libavcodec/aacdec.c
libavcodec/amrnbdec.c
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '90558e848a29ef1e85ecb1832ad9a26eebe958e0'
Michael Niedermayer [Sat, 13 Oct 2012 13:35:05 +0000 (15:35 +0200)]
Merge commit '90558e848a29ef1e85ecb1832ad9a26eebe958e0'

* commit '90558e848a29ef1e85ecb1832ad9a26eebe958e0':
  rangecoder: K&R formatting cosmetics

Conflicts:
libavcodec/rangecoder.c
libavcodec/rangecoder.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit 'ca411fc1d34329cd17b28627f697e391ae52073f'
Michael Niedermayer [Sat, 13 Oct 2012 13:25:11 +0000 (15:25 +0200)]
Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f'

* commit 'ca411fc1d34329cd17b28627f697e391ae52073f':
  avcodec: Remove broken MMI optimizations

Conflicts:
arch.mak
configure
libavcodec/avcodec.h
libavcodec/mips/Makefile
libavcodec/mips/dsputil_mmi.c
libavcodec/mips/idct_mmi.c
libavcodec/mips/mmi.h
libavcodec/mips/mpegvideo_mmi.c
libavcodec/options_table.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'
Michael Niedermayer [Sat, 13 Oct 2012 13:00:13 +0000 (15:00 +0200)]
Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'

* commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be':
  Remove libmpeg2 #define remnants
  De-doxygenize some top-level files

Conflicts:
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit 'd5c62122a7b26704bf867a1262df358623bf5edf'
Michael Niedermayer [Sat, 13 Oct 2012 12:35:42 +0000 (14:35 +0200)]
Merge commit 'd5c62122a7b26704bf867a1262df358623bf5edf'

* commit 'd5c62122a7b26704bf867a1262df358623bf5edf':
  Move av_reverse table to libavcodec

Conflicts:
libavcodec/asvenc.c
libavcodec/vble.c
libavutil/common.h
libavutil/mathematics.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066'
Michael Niedermayer [Sat, 13 Oct 2012 12:22:25 +0000 (14:22 +0200)]
Merge commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066'

* commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066':
  avutil: Duplicate ff_log2_tab instead of sharing it across libs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507'
Michael Niedermayer [Sat, 13 Oct 2012 11:57:47 +0000 (13:57 +0200)]
Merge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507'

* commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507':
  avfilter: call x86 init functions under if (ARCH_X86), not if (HAVE_MMX)
  rtspdec: Set the default port for listen mode, if none is specified
  tscc2: Fix an out of array access
  rtmpproto: Fix an out of array write
  rtspdec: Fix use of uninitialized byte
  vp8: reset loopfilter delta values at keyframes.
  avutil: add yuva422p and yuva444p formats

Conflicts:
libavutil/pixdesc.c
libavutil/pixfmt.h
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovp8dec: reset loopfilter delta values at keyframes
Sami Pietilä [Sat, 13 Oct 2012 10:43:24 +0000 (12:43 +0200)]
vp8dec: reset loopfilter delta values at keyframes

while testing a VP8 encoder I found a mismatch between FFMPEG and libvpx
VP8 decoders. The reason for this mismatch is that FFMPEG doesn't reset
loopfilter delta values at keyframes. Patch that fixes the issue is below.
I've verified that the output of ffmpeg after this patch matches libvpx.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoAllow autodetection of some dnxhd files that can be decoded correctly.
Carl Eugen Hoyos [Sat, 13 Oct 2012 08:26:06 +0000 (10:26 +0200)]
Allow autodetection of some dnxhd files that can be decoded correctly.

Fixes ticket #1807.

8 years agofate: update pcx reference
Paul B Mahol [Sat, 13 Oct 2012 09:05:28 +0000 (09:05 +0000)]
fate: update pcx reference

It changed because encoder now writes 0/1 for
sample aspect ratio instead of 0/0.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agopcxenc: store sample aspect ratio
Paul B Mahol [Thu, 11 Oct 2012 10:55:33 +0000 (10:55 +0000)]
pcxenc: store sample aspect ratio

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agopcx: read sample aspect ratio
Paul B Mahol [Thu, 11 Oct 2012 10:38:48 +0000 (10:38 +0000)]
pcx: read sample aspect ratio

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agobethsoftvideo: return meaningfull error codes
Paul B Mahol [Sat, 13 Oct 2012 08:05:42 +0000 (08:05 +0000)]
bethsoftvideo: return meaningfull error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agotruemotion2: use more meaningful return codes
Paul B Mahol [Fri, 12 Oct 2012 17:56:57 +0000 (17:56 +0000)]
truemotion2: use more meaningful return codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agovc1: Use codec ID from AVCodecContext while parsing frame header
Mashiat Sarker Shakkhar [Thu, 11 Oct 2012 17:13:56 +0000 (13:13 -0400)]
vc1: Use codec ID from AVCodecContext while parsing frame header

This fixes a segfault with samples that I have (both of them MPEG-TS). Looks like
avctx->codec is not being set during parsing.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
8 years agoavplay: support mid-stream sample rate changes
Justin Ruggles [Sun, 30 Sep 2012 22:18:00 +0000 (18:18 -0400)]
avplay: support mid-stream sample rate changes

Resample to the rate that was configured in SDL.

8 years agoavplay: use audio parameters from the decoded frame instead of AVCodecContext
Justin Ruggles [Mon, 8 Oct 2012 03:55:32 +0000 (23:55 -0400)]
avplay: use audio parameters from the decoded frame instead of AVCodecContext

8 years agodca: allocate a secondary buffer for extra channels when downmixing
Justin Ruggles [Thu, 11 Oct 2012 18:21:56 +0000 (14:21 -0400)]
dca: allocate a secondary buffer for extra channels when downmixing

The output AVFrame buffer only has data for the downmix channels.
Fixes a segfault when decoding dca with request_channels == 2.

8 years agoffserver: fix return value of add_codec()
Michael Niedermayer [Sat, 13 Oct 2012 03:36:41 +0000 (05:36 +0200)]
ffserver: fix return value of add_codec()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agojpegls: increase run_index to 4
Michael Niedermayer [Sat, 13 Oct 2012 01:49:11 +0000 (03:49 +0200)]
jpegls: increase run_index to 4

Fixes part of CID717913
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agojpegls: fix off limit
Michael Niedermayer [Sat, 13 Oct 2012 01:49:11 +0000 (03:49 +0200)]
jpegls: fix off limit

Fixes part of CID717913
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agorv30_decode_intra_types: make check tighter
Michael Niedermayer [Sat, 13 Oct 2012 01:21:23 +0000 (03:21 +0200)]
rv30_decode_intra_types: make check tighter

This makes no differnce as the affected values cannot occur
But it will likely help static analyzers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoff_celp_lp_synthesis_filterf: change loop end check
Michael Niedermayer [Sat, 13 Oct 2012 01:05:13 +0000 (03:05 +0200)]
ff_celp_lp_synthesis_filterf: change loop end check

This makes no difference for supported input but avoids a
out of array read with input that is never passed in currently

Fixes CID717919
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoff_celp_lp_synthesis_filterf: check that filter_length is within the supported range
Michael Niedermayer [Sat, 13 Oct 2012 01:04:23 +0000 (03:04 +0200)]
ff_celp_lp_synthesis_filterf: check that filter_length is within the supported range

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agortpdec_qdm2: change one assert to av_assert0
Michael Niedermayer [Sat, 13 Oct 2012 00:48:07 +0000 (02:48 +0200)]
rtpdec_qdm2: change one assert to av_assert0

Failure of this assert could lead to hard to debug behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agowtvdec: fix memleak on error
Michael Niedermayer [Sat, 13 Oct 2012 00:37:47 +0000 (02:37 +0200)]
wtvdec: fix memleak on error

Fixes CID718002
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavio: redesign ffio_rewind_with_probe_data()
Michael Niedermayer [Sat, 13 Oct 2012 00:08:59 +0000 (02:08 +0200)]
avio: redesign ffio_rewind_with_probe_data()

This prevents a double free

Fixes CID718285
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffv1: avoid checking a double for equality
Michael Niedermayer [Fri, 12 Oct 2012 23:47:31 +0000 (01:47 +0200)]
ffv1: avoid checking a double for equality

if 0.0 != 0.0 a out of array read would occur, equal checks
with floating point may behave in such odd ways, though
this is very unlikely in a real implementation of a compiler

Fixes: CID718936
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoaf_pan: fix memleak of arg
Michael Niedermayer [Fri, 12 Oct 2012 23:32:50 +0000 (01:32 +0200)]
af_pan: fix memleak of arg

Fixes CID718988
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovf_fade: fix memleaks of args
Michael Niedermayer [Fri, 12 Oct 2012 23:08:08 +0000 (01:08 +0200)]
vf_fade: fix memleaks of args

Fixes: CID718989
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoconfigure: use utilities from /usr/xpg4/bin if it exists
Mans Rullgard [Fri, 7 Sep 2012 11:50:43 +0000 (12:50 +0100)]
configure: use utilities from /usr/xpg4/bin if it exists

Solaris defaults to non-standard utilities (grep, sed, ...) with
proper ones being in /usr/xpg4/bin.  Prefixing PATH with this
directory when it exists ensures we get correct variants.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoavstring-test: fix memory leaks
Mans Rullgard [Fri, 12 Oct 2012 21:20:09 +0000 (22:20 +0100)]
avstring-test: fix memory leaks

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoffserver: prevent nb_streams from becoming too large
Michael Niedermayer [Fri, 12 Oct 2012 22:30:42 +0000 (00:30 +0200)]
ffserver: prevent nb_streams from becoming too large

Fixes CID732249

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoaacsbr: change order of operation to prevent out of array read
Michael Niedermayer [Fri, 12 Oct 2012 22:10:23 +0000 (00:10 +0200)]
aacsbr: change order of operation to prevent out of array read

Fixes CID732250
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix writing 12 bit DPX
Georg Lippitsch [Fri, 12 Oct 2012 19:18:50 +0000 (21:18 +0200)]
Fix writing 12 bit DPX

The DPX encoder now writes 12 DPX that open correctly (tested with
ImageMagick), and also correspond to the 12 bit sample files at
http://samples.ffmpeg.org/image-samples/dpx_samples.zip

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix DPX decoder
Georg Lippitsch [Fri, 12 Oct 2012 19:18:49 +0000 (21:18 +0200)]
Fix DPX decoder

Rewrite the DPX decoder to work with provided sample DPXs at
http://samples.ffmpeg.org/image-samples/dpx_samples.zip

The decoder could only decode 8 and 10 bit without alpha correctly,
failing or even crashing at other flavors. This patch aims to fix
these issues, properly decoding all variants of DPX provided in the
referenced DPX sample zip. For 10 and 12 bit, the alpha channel
is ignored, but decoding is still possible.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agortpdec_xiph: fix function return type
Mans Rullgard [Thu, 11 Oct 2012 20:59:12 +0000 (21:59 +0100)]
rtpdec_xiph: fix function return type

parse_packed_headers() returns either zero or a negative error code
so its return type must be signed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agosmjpeg: fix type of 'ret' variable in smjpeg_read_packet()
Mans Rullgard [Thu, 11 Oct 2012 20:53:22 +0000 (21:53 +0100)]
smjpeg: fix type of 'ret' variable in smjpeg_read_packet()

The 'ret' variable is used for negative error codes so it should
be a signed type.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agompegvideo: remove write-only variable
Mans Rullgard [Thu, 11 Oct 2012 20:51:41 +0000 (21:51 +0100)]
mpegvideo: remove write-only variable

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agolavf/swf: transform the swf tags define in an enum.
Clément Bœsch [Fri, 12 Oct 2012 21:12:03 +0000 (23:12 +0200)]
lavf/swf: transform the swf tags define in an enum.

8 years agolavf/swf: re-align after previous commit.
Clément Bœsch [Thu, 11 Oct 2012 22:14:45 +0000 (00:14 +0200)]
lavf/swf: re-align after previous commit.

8 years agolavf/swf: define more tags.
Clément Bœsch [Thu, 11 Oct 2012 22:13:49 +0000 (00:13 +0200)]
lavf/swf: define more tags.

Based on swf specs v10, page 271-273.

8 years agolavf/swfdec: return more meaningful error codes.
Clément Bœsch [Thu, 11 Oct 2012 21:59:54 +0000 (23:59 +0200)]
lavf/swfdec: return more meaningful error codes.

8 years agompeg4videodec: disable frame multithreading for GMC, its not implemented at all
Michael Niedermayer [Fri, 12 Oct 2012 20:38:54 +0000 (22:38 +0200)]
mpeg4videodec: disable frame multithreading for GMC, its not implemented at all

This fixes race conditions in decoding MPEG-4 GMC files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavf/swfdec: fix flushing with compressed swf.
Clément Bœsch [Fri, 12 Oct 2012 16:23:46 +0000 (18:23 +0200)]
lavf/swfdec: fix flushing with compressed swf.

We now only return in the middle of the refill in case of read error, so
inflate can be re-called if zlib needs an empty (z.avail_in=0) inflate
call for flushing.

8 years agorangecoder: K&R formatting cosmetics
Diego Biurrun [Fri, 5 Oct 2012 17:05:00 +0000 (19:05 +0200)]
rangecoder: K&R formatting cosmetics

8 years agoavcodec: Remove broken MMI optimizations
Diego Biurrun [Thu, 11 Oct 2012 14:48:27 +0000 (16:48 +0200)]
avcodec: Remove broken MMI optimizations

The code fails to compile and is broken beyond repair.

8 years agoRemove libmpeg2 #define remnants
Diego Biurrun [Thu, 11 Oct 2012 14:35:48 +0000 (16:35 +0200)]
Remove libmpeg2 #define remnants

8 years agoUse proper return values in case of missing features
Diego Biurrun [Mon, 8 Oct 2012 22:41:34 +0000 (00:41 +0200)]
Use proper return values in case of missing features

8 years agoDe-doxygenize some top-level files
Diego Biurrun [Fri, 24 Aug 2012 11:31:50 +0000 (13:31 +0200)]
De-doxygenize some top-level files

8 years agofate: add avstring test
Diego Biurrun [Sun, 30 Oct 2011 21:02:10 +0000 (22:02 +0100)]
fate: add avstring test

8 years agorangecoder-test: Set error message log level to error, instead of debug
Diego Biurrun [Fri, 5 Oct 2012 17:05:48 +0000 (19:05 +0200)]
rangecoder-test: Set error message log level to error, instead of debug

8 years agoMove av_reverse table to libavcodec
Diego Biurrun [Thu, 11 Oct 2012 16:50:30 +0000 (18:50 +0200)]
Move av_reverse table to libavcodec

It is only used in that library.

8 years agoavutil: Duplicate ff_log2_tab instead of sharing it across libs
Diego Biurrun [Thu, 4 Oct 2012 19:12:32 +0000 (21:12 +0200)]
avutil: Duplicate ff_log2_tab instead of sharing it across libs

The table is so small that the space gain is not worth the
performance overhead of cross-library access.

8 years agomovenc: fix timescale for timecode track
Michael Niedermayer [Fri, 12 Oct 2012 18:08:08 +0000 (20:08 +0200)]
movenc: fix timescale for timecode track

regression since b02493e476

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavfilter: call x86 init functions under if (ARCH_X86), not if (HAVE_MMX)
Diego Biurrun [Wed, 29 Aug 2012 17:37:14 +0000 (19:37 +0200)]
avfilter: call x86 init functions under if (ARCH_X86), not if (HAVE_MMX)

8 years agoadd dshow maintainer
rogerdpack [Thu, 11 Oct 2012 15:34:24 +0000 (09:34 -0600)]
add dshow maintainer

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomotion_est: more complete SAB diamond size check
Michael Niedermayer [Fri, 12 Oct 2012 17:33:39 +0000 (19:33 +0200)]
motion_est: more complete SAB diamond size check

This makes no difference with the current #defines

Fixes CID732255
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agocaca: fix 10l typo
Michael Niedermayer [Fri, 12 Oct 2012 17:03:49 +0000 (19:03 +0200)]
caca: fix 10l typo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws: do not use av_pix_fmt_descriptors directly
Paul B Mahol [Fri, 12 Oct 2012 16:57:04 +0000 (16:57 +0000)]
sws: do not use av_pix_fmt_descriptors directly

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agolavd: do not use av_pix_fmt_descriptors directly
Paul B Mahol [Fri, 12 Oct 2012 15:56:34 +0000 (15:56 +0000)]
lavd: do not use av_pix_fmt_descriptors directly

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoexr: fix twin ;
Michael Niedermayer [Fri, 12 Oct 2012 15:58:15 +0000 (17:58 +0200)]
exr: fix twin ;

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavidec: Use sample size in case incorrect timestamps for aac in AVI (Ticket #1755)
Heesuk Jung [Fri, 12 Oct 2012 04:47:22 +0000 (13:47 +0900)]
avidec: Use sample size in case incorrect timestamps for aac in AVI (Ticket #1755)

In some case for aac in AVI, avidec extracts wrong PTS value.
(www.ffmpeg.org/trac/ffmpeg/ticket/1755)

I found additional case(ss=4096) and add condition.

Problematic file link : https://docs.google.com/open?id=0B6r7ZfWFIypCOTdZQUtGVEdJUUE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoimgutils: do not use av_pix_fmt_descriptors directly
Paul B Mahol [Fri, 12 Oct 2012 15:39:02 +0000 (15:39 +0000)]
imgutils: do not use av_pix_fmt_descriptors directly

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoParse DEFINESOUND tags in swf (fix ticket 1638)
Michael Bradshaw [Fri, 12 Oct 2012 01:48:44 +0000 (19:48 -0600)]
Parse DEFINESOUND tags in swf (fix ticket 1638)

Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavc: do not use av_pix_fmt_descriptors directly
Paul B Mahol [Fri, 12 Oct 2012 15:13:42 +0000 (15:13 +0000)]
lavc: do not use av_pix_fmt_descriptors directly

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 12 Oct 2012 15:21:01 +0000 (17:21 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavu,lavd: do not use av_pix_fmt_descriptors directly.

Conflicts:
libavutil/imgutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agortspdec: Set the default port for listen mode, if none is specified
Martin Storsjö [Fri, 12 Oct 2012 08:10:09 +0000 (11:10 +0300)]
rtspdec: Set the default port for listen mode, if none is specified

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agotscc2: Fix an out of array access
Michael Niedermayer [Fri, 12 Oct 2012 00:26:50 +0000 (02:26 +0200)]
tscc2: Fix an out of array access

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortmpproto: Fix an out of array write
Michael Niedermayer [Fri, 12 Oct 2012 00:06:51 +0000 (02:06 +0200)]
rtmpproto: Fix an out of array write

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortspdec: Fix use of uninitialized byte
Michael Niedermayer [Thu, 11 Oct 2012 21:57:08 +0000 (23:57 +0200)]
rtspdec: Fix use of uninitialized byte

ffurl_read_complete can return 0 as well as negative error codes.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoMerge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'
Michael Niedermayer [Fri, 12 Oct 2012 15:04:58 +0000 (17:04 +0200)]
Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'

* commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627':
  lavfi: do not use av_pix_fmt_descriptors directly.

Conflicts:
libavfilter/buffersrc.c
libavfilter/drawutils.c
libavfilter/filtfmts.c
libavfilter/vf_ass.c
libavfilter/vf_boxblur.c
libavfilter/vf_drawtext.c
libavfilter/vf_lut.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_showinfo.c
libavfilter/vf_transpose.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '50ba57e0ce63d9904269ea0728936a0c79f8bfb5'
Michael Niedermayer [Fri, 12 Oct 2012 14:48:26 +0000 (16:48 +0200)]
Merge commit '50ba57e0ce63d9904269ea0728936a0c79f8bfb5'

* commit '50ba57e0ce63d9904269ea0728936a0c79f8bfb5':
  lavc: do not use av_pix_fmt_descriptors directly.

Conflicts:
libavcodec/imgconvert.c
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/mpegvideo.c
libavcodec/rawdec.c
libavcodec/rawenc.c
libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoyop: check return value of avformat_new_stream()
Paul B Mahol [Fri, 12 Oct 2012 14:23:01 +0000 (14:23 +0000)]
yop: check return value of avformat_new_stream()

Fixes null pointer dereference, fixes CID703729.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agovp8: reset loopfilter delta values at keyframes.
Sami Pietila [Fri, 12 Oct 2012 14:12:49 +0000 (07:12 -0700)]
vp8: reset loopfilter delta values at keyframes.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoMerge commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc'
Michael Niedermayer [Fri, 12 Oct 2012 13:52:55 +0000 (15:52 +0200)]
Merge commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc'

* commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc':
  mpegvideo: fix indentation
  sws: do not use av_pix_fmt_descriptors directly.

Conflicts:
libavcodec/mpegvideo.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df'
Michael Niedermayer [Fri, 12 Oct 2012 13:16:53 +0000 (15:16 +0200)]
Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df'

* commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df':
  tools: do not use av_pix_fmt_descriptors directly.
  pixdesc: add functions for accessing pixel format descriptors.
  build: add support for Tru64 (OSF/1)
  md5: Allocate a normal private context for the opaque md5 context pointer

Conflicts:
cmdutils.c
doc/APIchanges
ffprobe.c
libavformat/md5enc.c
libavutil/version.h
tools/graph2dot.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavutil: add yuva422p and yuva444p formats
Luca Barbato [Mon, 1 Oct 2012 02:18:02 +0000 (04:18 +0200)]
avutil: add yuva422p and yuva444p formats

8 years agoMerge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'
Michael Niedermayer [Fri, 12 Oct 2012 12:52:34 +0000 (14:52 +0200)]
Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'

* commit 'e002e3291e6dc7953f843abf56fc14f08f238b21':
  Use the new aes/md5/sha/tree allocation functions
  avutil: Add functions for allocating opaque contexts for algorithms
  svq3: fix pointer type warning
  svq3: replace unsafe pointer casting with intreadwrite macros
  parseutils-test: various cleanups

Conflicts:
doc/APIchanges
libavcodec/svq3.c
libavutil/parseutils.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '15ba7f6525c0f56f0c8e3e3e0c0c5129de054f41'
Michael Niedermayer [Fri, 12 Oct 2012 12:38:04 +0000 (14:38 +0200)]
Merge commit '15ba7f6525c0f56f0c8e3e3e0c0c5129de054f41'

* commit '15ba7f6525c0f56f0c8e3e3e0c0c5129de054f41':
  parseutils: fix const removal warning
  prepare 9_beta1 release

Conflicts:
Changelog
RELEASE
libavutil/parseutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '9734b8ba56d05e970c353dfd5baafa43fdb08024'
Michael Niedermayer [Fri, 12 Oct 2012 12:26:46 +0000 (14:26 +0200)]
Merge commit '9734b8ba56d05e970c353dfd5baafa43fdb08024'

* commit '9734b8ba56d05e970c353dfd5baafa43fdb08024':
  Move avutil tables only used in libavcodec to libavcodec.

Conflicts:
libavcodec/mathtables.c
libavutil/intmath.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '0a75d1da23b8659ec49391469bb592da12760077'
Michael Niedermayer [Fri, 12 Oct 2012 12:15:33 +0000 (14:15 +0200)]
Merge commit '0a75d1da23b8659ec49391469bb592da12760077'

* commit '0a75d1da23b8659ec49391469bb592da12760077':
  options_table: refs option is not snow-only
  random_seed: Support using CryptGenRandom on windows
  doc: update the faq entry about custom I/O

Conflicts:
doc/faq.texi
libavcodec/options_table.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agotruemotion2: remove unreachable code
Paul B Mahol [Fri, 12 Oct 2012 11:53:07 +0000 (11:53 +0000)]
truemotion2: remove unreachable code

Fixes CID610345.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agolavu,lavd: do not use av_pix_fmt_descriptors directly.
Anton Khirnov [Sat, 6 Oct 2012 11:29:37 +0000 (13:29 +0200)]
lavu,lavd: do not use av_pix_fmt_descriptors directly.

8 years agolavfi: do not use av_pix_fmt_descriptors directly.
Anton Khirnov [Sat, 6 Oct 2012 11:29:37 +0000 (13:29 +0200)]
lavfi: do not use av_pix_fmt_descriptors directly.

8 years agolavc: do not use av_pix_fmt_descriptors directly.
Anton Khirnov [Sat, 6 Oct 2012 11:29:37 +0000 (13:29 +0200)]
lavc: do not use av_pix_fmt_descriptors directly.

8 years agompegvideo: fix indentation
Anton Khirnov [Sat, 6 Oct 2012 13:21:17 +0000 (15:21 +0200)]
mpegvideo: fix indentation

8 years agotools: do not use av_pix_fmt_descriptors directly.
Anton Khirnov [Sat, 6 Oct 2012 11:29:37 +0000 (13:29 +0200)]
tools: do not use av_pix_fmt_descriptors directly.

8 years agosws: do not use av_pix_fmt_descriptors directly.
Anton Khirnov [Sat, 6 Oct 2012 11:29:37 +0000 (13:29 +0200)]
sws: do not use av_pix_fmt_descriptors directly.

8 years agopixdesc: add functions for accessing pixel format descriptors.
Anton Khirnov [Sat, 6 Oct 2012 10:36:38 +0000 (12:36 +0200)]
pixdesc: add functions for accessing pixel format descriptors.

Make av_pix_fmt_descriptors table static on next major bump.

Making the table public is dangerous, since the caller has no way to
know how large it actually is. It also prevents adding new fields to
AVPixFmtDescriptor without a major bump.

8 years agotakdec: stop decoding in case of unknown bps
Paul B Mahol [Fri, 12 Oct 2012 09:18:58 +0000 (09:18 +0000)]
takdec: stop decoding in case of unknown bps

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agotakdec: s/bits_per_coded_sample/bits_per_raw_sample
Paul B Mahol [Fri, 12 Oct 2012 08:51:47 +0000 (08:51 +0000)]
takdec: s/bits_per_coded_sample/bits_per_raw_sample

bits_per_coded_sample should be set from demuxer and
not from decoder.

Prior to this change value set from demuxer would get
overwritten in decoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agonellymoserenc: fix array element ordering
Michael Niedermayer [Fri, 12 Oct 2012 02:19:38 +0000 (04:19 +0200)]
nellymoserenc: fix array element ordering

Fixes assertion failures in trellis encoder
Fixes valgrind warnings in trellis encoder
Fixes CID732257
Fixes CID732256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobuild: add support for Tru64 (OSF/1)
Mans Rullgard [Thu, 11 Oct 2012 11:33:38 +0000 (12:33 +0100)]
build: add support for Tru64 (OSF/1)

Signed-off-by: Mans Rullgard <mans@mansr.com>