ffmpeg.git
5 years agoMerge commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c'
Michael Niedermayer [Sun, 13 Oct 2013 04:42:44 +0000 (06:42 +0200)]
Merge commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c'

* commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c':
  audio_mix: fix channel order in mix_1_to_2_fltp_flt_c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc: rename h265 to hevc, add AV_CODEC_ID_H265 with identical value for backward...
Michael Niedermayer [Sat, 12 Oct 2013 11:29:31 +0000 (13:29 +0200)]
lavc: rename h265 to hevc, add AV_CODEC_ID_H265 with identical value for backward compatibility

Somehow 2 different identifiers have come into existence which makes supporting
both until the next major version bump required
I did not investigate how exactly that did happen.

wm4, j-b and smarter prefer hevc.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/avr: use ff_get_pcm_codec_id()
Paul B Mahol [Sat, 12 Oct 2013 20:21:38 +0000 (20:21 +0000)]
avformat/avr: use ff_get_pcm_codec_id()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavfilter/vsrc_testsrc: smpte(hd)bars: use yuv directly
Paul B Mahol [Sat, 12 Oct 2013 17:52:12 +0000 (17:52 +0000)]
avfilter/vsrc_testsrc: smpte(hd)bars: use yuv directly

Also set color space.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavfilter/vf_separatefields: do not reset pts to 0
Paul B Mahol [Sat, 12 Oct 2013 14:55:42 +0000 (14:55 +0000)]
avfilter/vf_separatefields: do not reset pts to 0

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoaudio_mix: fix channel order in mix_1_to_2_fltp_flt_c
Anton Khirnov [Wed, 2 Oct 2013 14:40:02 +0000 (16:40 +0200)]
audio_mix: fix channel order in mix_1_to_2_fltp_flt_c

CC:libav-stable@libav.org

5 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Sat, 12 Oct 2013 12:14:48 +0000 (14:14 +0200)]
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  avformat/ftp: add log regarding passive mode failure
  avformat/ftp: fix possible deadlock
  avdevice/pulse_audio_enc: fix stream index

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 12 Oct 2013 12:03:50 +0000 (14:03 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  riff: Add a mapping for VP6A

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/ftp: add log regarding passive mode failure
Lukasz Marek [Sat, 12 Oct 2013 11:50:22 +0000 (13:50 +0200)]
avformat/ftp: add log regarding passive mode failure

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agoavformat/ftp: fix possible deadlock
Lukasz Marek [Sat, 12 Oct 2013 10:53:54 +0000 (12:53 +0200)]
avformat/ftp: fix possible deadlock

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agoavdevice/pulse_audio_enc: fix stream index
Lukasz Marek [Sat, 12 Oct 2013 10:51:41 +0000 (12:51 +0200)]
avdevice/pulse_audio_enc: fix stream index

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agoriff: Add a mapping for VP6A
Martin Storsjö [Wed, 14 Aug 2013 09:38:56 +0000 (12:38 +0300)]
riff: Add a mapping for VP6A

This allows demuxing VP6A from F4V files.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavfilter/lavfutils: fix memleak of avpacket
Michael Niedermayer [Sat, 12 Oct 2013 09:42:08 +0000 (11:42 +0200)]
avfilter/lavfutils: fix memleak of avpacket

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_removelogo: fix pixel pointer so it points where its intended
Michael Niedermayer [Sat, 12 Oct 2013 09:36:23 +0000 (11:36 +0200)]
avfilter/vf_removelogo: fix pixel pointer so it points where its intended

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_removelogo: fix offset for accessing pixels above and below
Michael Niedermayer [Sat, 12 Oct 2013 09:35:54 +0000 (11:35 +0200)]
avfilter/vf_removelogo: fix offset for accessing pixels above and below

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_removelogo: use av_freep() for saftey
Michael Niedermayer [Sat, 12 Oct 2013 09:30:51 +0000 (11:30 +0200)]
avfilter/vf_removelogo: use av_freep() for saftey

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/movenc: set XDCAM codec tag correctly
Michael Niedermayer [Mon, 7 Oct 2013 15:36:23 +0000 (17:36 +0200)]
avformat/movenc: set XDCAM codec tag correctly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/movenc: set pretty compressor name for XDCAM
Michael Niedermayer [Mon, 7 Oct 2013 16:15:25 +0000 (18:15 +0200)]
avformat/movenc: set pretty compressor name for XDCAM

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/movenc: make AVStream easier to access
Michael Niedermayer [Mon, 7 Oct 2013 15:35:40 +0000 (17:35 +0200)]
avformat/movenc: make AVStream easier to access

This adds a AVStream pointer to Track

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/codecs: Add missing mpeg2 aac profiles
Timothy Gu [Mon, 16 Sep 2013 00:38:16 +0000 (17:38 -0700)]
doc/codecs: Add missing mpeg2 aac profiles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/codecs: Add ignorecrop
Timothy Gu [Mon, 16 Sep 2013 00:38:16 +0000 (17:38 -0700)]
doc/codecs: Add ignorecrop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/codecs: Remove no longer existing options
Timothy Gu [Mon, 16 Sep 2013 00:38:16 +0000 (17:38 -0700)]
doc/codecs: Remove no longer existing options

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/codecs: Cosmetics in the flags2 description
Timothy Gu [Tue, 24 Sep 2013 02:04:12 +0000 (19:04 -0700)]
doc/codecs: Cosmetics in the flags2 description

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/codecs: document skip_alpha
Michael Niedermayer [Fri, 11 Oct 2013 14:59:32 +0000 (16:59 +0200)]
doc/codecs: document skip_alpha

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 11 Oct 2013 14:48:10 +0000 (16:48 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  prores: Reject negative run and level values

See: 93c220e895a417e88a6be7df85e250c5c3f675b6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/filters/scale: do not explicitly state the default swscale flags value
Stefano Sabatini [Fri, 11 Oct 2013 12:50:41 +0000 (14:50 +0200)]
doc/filters/scale: do not explicitly state the default swscale flags value

This is done is order to avoid the need of synching scale with libswscale
docs in case the libswscale default changes.

5 years agolavf/riff.c: Fix GeoVision H.264 fourcc.
Carl Eugen Hoyos [Fri, 11 Oct 2013 14:23:09 +0000 (16:23 +0200)]
lavf/riff.c: Fix GeoVision H.264 fourcc.

Fixes d24da748

5 years agoAdd H.264 fourcc GAVC for GeoVision cameras.
Carl Eugen Hoyos [Fri, 11 Oct 2013 08:02:00 +0000 (10:02 +0200)]
Add H.264 fourcc GAVC for GeoVision cameras.

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 11 Oct 2013 07:20:58 +0000 (09:20 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mxf: Add jpeg2000 codec to intra only codecs

See: c461265a769e9ddadc2e3ee5b759937646fcc839
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020'
Michael Niedermayer [Fri, 11 Oct 2013 06:28:41 +0000 (08:28 +0200)]
Merge commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020'

* commit '5f5ada3dbf97e306a74250ba8dcf8619ad59b020':
  shorten: Fix out-of-array read

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ed796fba761f4794bec7735d467c1b2c8e1858fe'
Michael Niedermayer [Fri, 11 Oct 2013 06:22:03 +0000 (08:22 +0200)]
Merge commit 'ed796fba761f4794bec7735d467c1b2c8e1858fe'

* commit 'ed796fba761f4794bec7735d467c1b2c8e1858fe':
  atrac3: Better name for IMDCT window initialization
  atrac3: Remove unused gain compensation tables

See: 2d52834910a4a043d150fc3fce9a06372d5aa108
See: 4fb8de08e1107db9a42fd4e6e4a72a8ebc5439fa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: set the source_index for trivial filter graphs
Michael Niedermayer [Thu, 10 Oct 2013 22:33:25 +0000 (00:33 +0200)]
ffmpeg: set the source_index for trivial filter graphs

Fixes one testcase in Ticket2969

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoprores: Reject negative run and level values
Luca Barbato [Thu, 10 Oct 2013 19:02:10 +0000 (21:02 +0200)]
prores: Reject negative run and level values

Sample-Id: 00000611-google

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
5 years agoavcodec/exr: remove pointless initialization
Paul B Mahol [Thu, 10 Oct 2013 09:54:48 +0000 (09:54 +0000)]
avcodec/exr: remove pointless initialization

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoatrac3: Better name for imdct window initialization
Maxim Poliakovski [Thu, 10 Oct 2013 08:51:48 +0000 (10:51 +0200)]
atrac3: Better name for imdct window initialization

Patch by Diego Biurrun.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoatrac3: Remove unused gain compensation tables
Maxim Poliakovski [Thu, 10 Oct 2013 08:49:53 +0000 (10:49 +0200)]
atrac3: Remove unused gain compensation tables

Patch by Diego Biurrun.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomxf: Add jpeg2000 codec to intra only codecs
Matthieu Bouron [Tue, 1 Oct 2013 11:05:26 +0000 (13:05 +0200)]
mxf: Add jpeg2000 codec to intra only codecs

Conform with SMPTE RP 224 and SMPTE s422.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoshorten: Fix out-of-array read
Tim Walker [Wed, 9 Oct 2013 09:47:04 +0000 (11:47 +0200)]
shorten: Fix out-of-array read

pred_order == FF_ARRAY_ELEMS(fixed_coeffs) is invalid too.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoswscale: Use full resolution chroma for yuv2rgb when the input has full chroma
Michael Niedermayer [Wed, 9 Oct 2013 16:43:42 +0000 (18:43 +0200)]
swscale: Use full resolution chroma for yuv2rgb when the input has full chroma

See Ticket3028

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_w3fdif: do not reset pts to 0
Paul B Mahol [Thu, 10 Oct 2013 11:43:03 +0000 (11:43 +0000)]
avfilter/vf_w3fdif: do not reset pts to 0

Shamelessly stolen from yadif.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agodoc/codecs: Document field_order
Michael Niedermayer [Thu, 10 Oct 2013 13:59:24 +0000 (15:59 +0200)]
doc/codecs: Document field_order

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoatrac3: Better name for IMDCT window initialization
Maxim Poliakovski [Thu, 10 Oct 2013 08:07:24 +0000 (10:07 +0200)]
atrac3: Better name for IMDCT window initialization

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoatrac3: Remove unused gain compensation tables
Maxim Poliakovski [Thu, 10 Oct 2013 07:59:03 +0000 (09:59 +0200)]
atrac3: Remove unused gain compensation tables

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agodoc/encoder/aac: Remove -cutoff trick
Timothy Gu [Thu, 10 Oct 2013 02:52:16 +0000 (19:52 -0700)]
doc/encoder/aac: Remove -cutoff trick

Fix Ticket #2686 comment 155.

Trick obsoleted since 72dabdfc58064fcb249f26fc7afca2221f18a832.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/x86: Fix emulated_edge_mc SSE code to not contain SSE2 instructions on...
Ronald S. Bultje [Thu, 10 Oct 2013 01:24:20 +0000 (21:24 -0400)]
libavcodec/x86: Fix emulated_edge_mc SSE code to not contain SSE2 instructions on x86-32.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/proresdec2: propagate error codes
Michael Niedermayer [Thu, 10 Oct 2013 10:39:23 +0000 (12:39 +0200)]
avcodec/proresdec2: propagate error codes

Based-on: 44690dfa683f620c77e9f0e8e9bc5682608636b1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vmnc/reset_buffers(): reset cur_hx/hy too for saftey
Michael Niedermayer [Thu, 10 Oct 2013 10:30:52 +0000 (12:30 +0200)]
avcodec/vmnc/reset_buffers(): reset cur_hx/hy too for saftey

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 10 Oct 2013 10:21:47 +0000 (12:21 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  prores: Error out only on surely incomplete ac_coeffs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '44690dfa683f620c77e9f0e8e9bc5682608636b1'
Michael Niedermayer [Thu, 10 Oct 2013 10:14:04 +0000 (12:14 +0200)]
Merge commit '44690dfa683f620c77e9f0e8e9bc5682608636b1'

* commit '44690dfa683f620c77e9f0e8e9bc5682608636b1':
  prores: Add a codepath for decoding errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90'
Michael Niedermayer [Thu, 10 Oct 2013 10:06:17 +0000 (12:06 +0200)]
Merge commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90'

* commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90':
  flvenc: Write proper cropping for VP6 even if there's no extradata

Conflicts:
libavformat/flvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'be1e1373d267bae2af8a62d79eef736736f24565'
Michael Niedermayer [Thu, 10 Oct 2013 09:57:14 +0000 (11:57 +0200)]
Merge commit 'be1e1373d267bae2af8a62d79eef736736f24565'

* commit 'be1e1373d267bae2af8a62d79eef736736f24565':
  flvenc: Support muxing VP6A as well

Conflicts:
libavformat/flvenc.c

See: 42ae83c196d5747e8a87772a50a02a7b3f2855c3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b'
Michael Niedermayer [Thu, 10 Oct 2013 09:45:45 +0000 (11:45 +0200)]
Merge commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b'

* commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b':
  flvenc: Don't pretend to support muxing "plain" VP6

Conflicts:
libavformat/flvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '41a10f3ba149a2012de499d0b4ad4955d81f28d5'
Michael Niedermayer [Thu, 10 Oct 2013 09:37:36 +0000 (11:37 +0200)]
Merge commit '41a10f3ba149a2012de499d0b4ad4955d81f28d5'

* commit '41a10f3ba149a2012de499d0b4ad4955d81f28d5':
  vp6: Support cropping to AVCodecContext.width/height

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ceec6e792e4b5baaa23b220f4fd33417631f5288'
Michael Niedermayer [Thu, 10 Oct 2013 09:30:28 +0000 (11:30 +0200)]
Merge commit 'ceec6e792e4b5baaa23b220f4fd33417631f5288'

* commit 'ceec6e792e4b5baaa23b220f4fd33417631f5288':
  avi: directly resync on DV in AVI read failure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '756547ce7f4d67a18663503e2157aebed3531703'
Michael Niedermayer [Thu, 10 Oct 2013 08:54:17 +0000 (10:54 +0200)]
Merge commit '756547ce7f4d67a18663503e2157aebed3531703'

* commit '756547ce7f4d67a18663503e2157aebed3531703':
  avi: DV in AVI must be considered single stream

Conflicts:
libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1cac9accbd1f9b8596122d0735e37b97a844c514'
Michael Niedermayer [Thu, 10 Oct 2013 08:38:46 +0000 (10:38 +0200)]
Merge commit '1cac9accbd1f9b8596122d0735e37b97a844c514'

* commit '1cac9accbd1f9b8596122d0735e37b97a844c514':
  avi: properly fail if the dv demuxer is missing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1018a92219a38a812cf97761c6b3a5e66a400f4b'
Michael Niedermayer [Thu, 10 Oct 2013 07:55:17 +0000 (09:55 +0200)]
Merge commit '1018a92219a38a812cf97761c6b3a5e66a400f4b'

* commit '1018a92219a38a812cf97761c6b3a5e66a400f4b':
  jpeg2000: Check block length

See: 914ab4cd1c59eae10771f2d6a892ec6b6f36b0e2
See: 582f53349eabd75164d4389503eb95048982cfdc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoprores: Error out only on surely incomplete ac_coeffs
Luca Barbato [Thu, 10 Oct 2013 08:26:31 +0000 (10:26 +0200)]
prores: Error out only on surely incomplete ac_coeffs

5 years agoprores: Add a codepath for decoding errors
Luca Barbato [Thu, 10 Oct 2013 06:40:39 +0000 (08:40 +0200)]
prores: Add a codepath for decoding errors

5 years agoMerge commit '071e29af4d383bdb44d0c87416dee3e4bb597936'
Michael Niedermayer [Thu, 10 Oct 2013 07:45:11 +0000 (09:45 +0200)]
Merge commit '071e29af4d383bdb44d0c87416dee3e4bb597936'

* commit '071e29af4d383bdb44d0c87416dee3e4bb597936':
  vmnc: Use meaningful return values

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoflvenc: Write proper cropping for VP6 even if there's no extradata
Martin Storsjö [Thu, 15 Aug 2013 08:07:30 +0000 (11:07 +0300)]
flvenc: Write proper cropping for VP6 even if there's no extradata

This keeps cropping when remuxing from F4V to FLV.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoflvenc: Support muxing VP6A as well
Martin Storsjö [Thu, 15 Aug 2013 08:04:07 +0000 (11:04 +0300)]
flvenc: Support muxing VP6A as well

Handle it in the same way as VP6F, except for the codec tag.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoflvenc: Don't pretend to support muxing "plain" VP6
Martin Storsjö [Thu, 15 Aug 2013 08:01:55 +0000 (11:01 +0300)]
flvenc: Don't pretend to support muxing "plain" VP6

The plain VP6 format is vertically flipped compared to VP6F/VP6A.
Support for the plain VP6 format was added in 09d8c0ae831 (which
also introduced support for muxing VP6F properly in general).

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agovp6: Support cropping to AVCodecContext.width/height
Martin Storsjö [Wed, 14 Aug 2013 09:39:29 +0000 (12:39 +0300)]
vp6: Support cropping to AVCodecContext.width/height

In these cases, there is no extradata but only the properly set
width/height values by the demuxer.

This makes sure VP6 in F4V files is cropped properly.

This is similar to what is done for H264 for letting the container
width/height override what's in the bitstream, since 30f515091.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoMerge commit '5e992a4682d2c09eed3839c6cacf70db3b65c2f4'
Michael Niedermayer [Thu, 10 Oct 2013 07:37:55 +0000 (09:37 +0200)]
Merge commit '5e992a4682d2c09eed3839c6cacf70db3b65c2f4'

* commit '5e992a4682d2c09eed3839c6cacf70db3b65c2f4':
  vmnc: Check the cursor dimensions

Conflicts:
libavcodec/vmnc.c

See: 94372592767fb551060217df37f5aa3130ba1ca8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '61cd19b8bc32185c8caf64d89d1b0909877a0707'
Michael Niedermayer [Thu, 10 Oct 2013 07:18:16 +0000 (09:18 +0200)]
Merge commit '61cd19b8bc32185c8caf64d89d1b0909877a0707'

* commit '61cd19b8bc32185c8caf64d89d1b0909877a0707':
  vmnc: Port to bytestream2

Conflicts:
libavcodec/vmnc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a66aa0daf290ef157cb3322b034b43d6201c43e9'
Michael Niedermayer [Thu, 10 Oct 2013 07:04:22 +0000 (09:04 +0200)]
Merge commit 'a66aa0daf290ef157cb3322b034b43d6201c43e9'

* commit 'a66aa0daf290ef157cb3322b034b43d6201c43e9':
  vmnc: K&R formatting cosmetics

Conflicts:
libavcodec/vmnc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavi: directly resync on DV in AVI read failure
Luca Barbato [Tue, 6 Aug 2013 01:52:48 +0000 (03:52 +0200)]
avi: directly resync on DV in AVI read failure

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
5 years agoavi: DV in AVI must be considered single stream
Luca Barbato [Tue, 6 Aug 2013 01:38:12 +0000 (03:38 +0200)]
avi: DV in AVI must be considered single stream

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
5 years agoavi: properly fail if the dv demuxer is missing
Luca Barbato [Mon, 5 Aug 2013 23:39:07 +0000 (01:39 +0200)]
avi: properly fail if the dv demuxer is missing

CC: libav-stable@libav.org
5 years agoavcodec/h264: call flush_change() on init
Michael Niedermayer [Thu, 10 Oct 2013 00:25:51 +0000 (02:25 +0200)]
avcodec/h264: call flush_change() on init

This ensures that all the non zero fields get setup correctly.
Alternatively their initialization could be duplicated.

Fixes Ticket2738

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264_refs: modify key frame detection heuristic to detect more cases
Michael Niedermayer [Wed, 9 Oct 2013 21:52:54 +0000 (23:52 +0200)]
avcodec/h264_refs: modify key frame detection heuristic to detect more cases

Fixes Ticket2968

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agojpeg2000: Check block length
Luca Barbato [Wed, 9 Oct 2013 04:17:12 +0000 (06:17 +0200)]
jpeg2000: Check block length

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
5 years agovmnc: Use meaningful return values
Luca Barbato [Wed, 9 Oct 2013 03:58:59 +0000 (05:58 +0200)]
vmnc: Use meaningful return values

5 years agovmnc: Check the cursor dimensions
Luca Barbato [Wed, 9 Oct 2013 03:51:20 +0000 (05:51 +0200)]
vmnc: Check the cursor dimensions

And manage the reallocation failure path.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
5 years agovmnc: Port to bytestream2
Luca Barbato [Wed, 9 Oct 2013 03:13:59 +0000 (05:13 +0200)]
vmnc: Port to bytestream2

Fix some buffer overreads.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
5 years agovmnc: K&R formatting cosmetics
Luca Barbato [Wed, 9 Oct 2013 10:58:42 +0000 (12:58 +0200)]
vmnc: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoavformat/wavdec: Dont trust the fact chunk for PCM
Michael Niedermayer [Wed, 9 Oct 2013 19:43:06 +0000 (21:43 +0200)]
avformat/wavdec: Dont trust the fact chunk for PCM

Fixes Ticket3033

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/xv.c: Include XShm.h before Xvlib.h.
Carl Eugen Hoyos [Wed, 9 Oct 2013 13:32:21 +0000 (15:32 +0200)]
lavd/xv.c: Include XShm.h before Xvlib.h.

This may fix compilation with libxv 1.0.4.

5 years agoavfilter/buffersink: try to fix AV_NOPTS_VALUE
Michael Niedermayer [Wed, 9 Oct 2013 14:28:51 +0000 (16:28 +0200)]
avfilter/buffersink: try to fix AV_NOPTS_VALUE

no testcase available, just found this issue by reading the code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/ff_filter_frame_needs_framing: fix handling of AV_NOPTS_VALUE
Michael Niedermayer [Wed, 9 Oct 2013 14:24:00 +0000 (16:24 +0200)]
avfilter/ff_filter_frame_needs_framing: fix handling of AV_NOPTS_VALUE

Fixes Ticket3015

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/exr: use avpriv_report_missing_feature()
Paul B Mahol [Wed, 9 Oct 2013 13:46:44 +0000 (13:46 +0000)]
avcodec/exr: use avpriv_report_missing_feature()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/vmnc: use av_freep()
Paul B Mahol [Wed, 9 Oct 2013 12:21:14 +0000 (12:21 +0000)]
avcodec/vmnc: use av_freep()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 9 Oct 2013 12:27:00 +0000 (14:27 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86inc: Remove .rodata kludges

Conflicts:
libavutil/x86/x86inc.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9e3946aadaef6f7d7ef15c31b5ff1e73d0ba79a1'
Michael Niedermayer [Wed, 9 Oct 2013 12:00:33 +0000 (14:00 +0200)]
Merge commit '9e3946aadaef6f7d7ef15c31b5ff1e73d0ba79a1'

* commit '9e3946aadaef6f7d7ef15c31b5ff1e73d0ba79a1':
  build: Require yasm 0.8.0 or higher

Conflicts:
configure

If someone wants to continue supporting older yasm/nasm versions, patches are of course welcome!

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86inc: Remove .rodata kludges
Henrik Gramner [Wed, 11 Sep 2013 15:49:25 +0000 (17:49 +0200)]
x86inc: Remove .rodata kludges

The Mach-O bug was fixed in yasm 0.8.0 and we don't
support versions that old anymore.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agobuild: Require yasm 0.8.0 or higher
Derek Buitenhuis [Mon, 7 Oct 2013 11:18:54 +0000 (07:18 -0400)]
build: Require yasm 0.8.0 or higher

This is in preparation for removing a .rodata kludge
which was only required for older YASM versions.

The movbe instruction was introduced in 0.8.0, which already
had AVX, which was introduced in 0.7.0, and NASM introduced
movbe in 2.0.3, which is the same version which introduced
AVX support.

Also, make the failure message more accurate.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agodoc/filters: remove extra spacing in vid.stab section.
Clément Bœsch [Wed, 9 Oct 2013 11:22:04 +0000 (13:22 +0200)]
doc/filters: remove extra spacing in vid.stab section.

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 9 Oct 2013 09:04:06 +0000 (11:04 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  shorten: Extend fixed_coeffs to properly support pred_order 0

Conflicts:
libavcodec/shorten.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix make checkheaders for vp9 header files.
Carl Eugen Hoyos [Wed, 9 Oct 2013 07:42:16 +0000 (09:42 +0200)]
Fix make checkheaders for vp9 header files.

5 years agoAdd pulse_audio_common.h to skipheaders.
Carl Eugen Hoyos [Wed, 9 Oct 2013 07:39:57 +0000 (09:39 +0200)]
Add pulse_audio_common.h to skipheaders.

Fixes an error when running make checkheaders.

5 years agoMAINTAINERS: add Communication section
Lou Logan [Sun, 6 Oct 2013 00:09:15 +0000 (16:09 -0800)]
MAINTAINERS: add Communication section

Add Twitter with myself (Lou Logan) as maintainer.

Add Google+ with Paul B Mahol, Michael Niedermayer, and Alexander
Strasser as maintainers.

Move website and mailinglists from Miscellaneous Areas to
Communication.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/default.css + doc/t2h.init: New styles
Timothy Gu [Tue, 24 Sep 2013 03:40:45 +0000 (20:40 -0700)]
doc/default.css + doc/t2h.init: New styles

The main motive of this commit is to make the offline copy of the HTML doc as
pretty as the online (ffmpeg.org) one. This also introduced new styles for
<h2> to <h4>.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoshorten: Extend fixed_coeffs to properly support pred_order 0
Luca Barbato [Wed, 4 Sep 2013 17:26:36 +0000 (19:26 +0200)]
shorten: Extend fixed_coeffs to properly support pred_order 0

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
5 years agoffserver: strip odd chars from html error messages before sending them back
Michael Niedermayer [Tue, 8 Oct 2013 22:30:46 +0000 (00:30 +0200)]
ffserver: strip odd chars from html error messages before sending them back

Fixes Ticket3034

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/pulse: move common code to separate file
Lukasz Marek [Fri, 4 Oct 2013 12:21:29 +0000 (14:21 +0200)]
lavd/pulse: move common code to separate file

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/pulse: rename pulse.c into pulse_audio_dec.c
Lukasz Marek [Fri, 4 Oct 2013 12:29:06 +0000 (14:29 +0200)]
lavd/pulse: rename pulse.c into pulse_audio_dec.c

This make name of the file more specific
as there is also encoder implementation.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/af_join: remove now unnecessary goto
Paul B Mahol [Mon, 7 Oct 2013 15:08:27 +0000 (15:08 +0000)]
avfilter/af_join: remove now unnecessary goto

Options are freed from the generic code now, there is no need to call
av_opt_free() from the filter.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/xwddec: use avpriv_report_missing_feature
Paul B Mahol [Mon, 7 Oct 2013 13:41:50 +0000 (13:41 +0000)]
avcodec/xwddec: use avpriv_report_missing_feature

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agodpx: abgr support
Paul B Mahol [Tue, 8 Oct 2013 11:29:29 +0000 (11:29 +0000)]
dpx: abgr support

Signed-off-by: Paul B Mahol <onemda@gmail.com>