ffmpeg.git
5 years agoMerge commit '072916d903d3a925bcd0c864f12254157cab63c1'
Michael Niedermayer [Sun, 3 Aug 2014 17:35:08 +0000 (19:35 +0200)]
Merge commit '072916d903d3a925bcd0c864f12254157cab63c1'

* commit '072916d903d3a925bcd0c864f12254157cab63c1':
  filtfmts: Replace deprecated uses of AVFilterPad

Conflicts:
libavfilter/filtfmts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6a928293dd29c7f0dcf09107980a1d651c9957df'
Michael Niedermayer [Sun, 3 Aug 2014 17:18:13 +0000 (19:18 +0200)]
Merge commit '6a928293dd29c7f0dcf09107980a1d651c9957df'

* commit '6a928293dd29c7f0dcf09107980a1d651c9957df':
  examples: filter_audio: Add missing mem.h header for av_freep()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c6a1ac2dd9808a4753dd005ab5747dda68ab454f'
Michael Niedermayer [Sun, 3 Aug 2014 17:06:39 +0000 (19:06 +0200)]
Merge commit 'c6a1ac2dd9808a4753dd005ab5747dda68ab454f'

* commit 'c6a1ac2dd9808a4753dd005ab5747dda68ab454f':
  vf_fps: Replace use of deprecated AVFilterBufferRef by AVFrame

See: a05a44e205d6ae13d5eb1cd8d4ad2dba6ec940b3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c697c590fbf296b1679b80c8f4071e4c8a6c884b'
Michael Niedermayer [Sun, 3 Aug 2014 16:58:19 +0000 (18:58 +0200)]
Merge commit 'c697c590fbf296b1679b80c8f4071e4c8a6c884b'

* commit 'c697c590fbf296b1679b80c8f4071e4c8a6c884b':
  lcl: Disentangle pointers to input data and decompression buffer

Conflicts:
libavcodec/lcldec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'df507d5aa063c2ce31fac9f76c6f3bbe9a20c445'
Michael Niedermayer [Sun, 3 Aug 2014 16:35:47 +0000 (18:35 +0200)]
Merge commit 'df507d5aa063c2ce31fac9f76c6f3bbe9a20c445'

* commit 'df507d5aa063c2ce31fac9f76c6f3bbe9a20c445':
  tiff: Replace deprecated PIX_FMT names by modern ones

Conflicts:
libavcodec/tiff.c

See: ac627b3d38d370027406c93c2dcaac0b1712a7d4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7835c24e19d9e1cb43fba5a02ce9d81d518f1300'
Michael Niedermayer [Sun, 3 Aug 2014 16:29:38 +0000 (18:29 +0200)]
Merge commit '7835c24e19d9e1cb43fba5a02ce9d81d518f1300'

* commit '7835c24e19d9e1cb43fba5a02ce9d81d518f1300':
  dv: Update DV-profile-related functions to current public API

Conflicts:
libavcodec/dvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegtsenc: do not flush after everything
Michael Niedermayer [Sun, 3 Aug 2014 15:46:06 +0000 (17:46 +0200)]
avformat/mpegtsenc: do not flush after everything

there is flushing code in the avformat core that does this in a more
controlled way.

Fixes ticket2748

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mux: flush after header writing, like after packets
Michael Niedermayer [Sun, 3 Aug 2014 15:44:56 +0000 (17:44 +0200)]
avformat/mux: flush after header writing, like after packets

This makes problematic unconditional flushes in mpegts redundant
And is thus part of a fix for ticket 2748

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pnm: check buf[0] before using buf[1]
Michael Niedermayer [Sun, 3 Aug 2014 12:01:03 +0000 (14:01 +0200)]
avcodec/pnm: check buf[0] before using buf[1]

Fixes CSA warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofiltfmts: Replace deprecated uses of AVFilterPad
Diego Biurrun [Sat, 2 Aug 2014 19:51:48 +0000 (12:51 -0700)]
filtfmts: Replace deprecated uses of AVFilterPad

Also add missing mem.h header for av_freep().

5 years agoavcodec/takdec: remove unused variable
Michael Niedermayer [Sat, 2 Aug 2014 19:22:56 +0000 (21:22 +0200)]
avcodec/takdec: remove unused variable

Found-by: CSA
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/takdec: move tmp declaration to where its used
Michael Niedermayer [Sat, 2 Aug 2014 19:20:04 +0000 (21:20 +0200)]
avcodec/takdec: move tmp declaration to where its used

Makes the code a bit easier to read

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/ffserver: merge paragraph starting with "What happens next?" with previous one
Stefano Sabatini [Sat, 2 Aug 2014 14:33:16 +0000 (16:33 +0200)]
doc/ffserver: merge paragraph starting with "What happens next?" with previous one

The name of the paragraph sounded a bit silly, and its text is small so
it's better to merge it with the previous paragraph.

5 years agoexamples: filter_audio: Add missing mem.h header for av_freep()
Diego Biurrun [Sat, 2 Aug 2014 19:39:22 +0000 (12:39 -0700)]
examples: filter_audio: Add missing mem.h header for av_freep()

5 years agovf_fps: Replace use of deprecated AVFilterBufferRef by AVFrame
Diego Biurrun [Sat, 2 Aug 2014 19:30:11 +0000 (12:30 -0700)]
vf_fps: Replace use of deprecated AVFilterBufferRef by AVFrame

5 years agolcl: Disentangle pointers to input data and decompression buffer
Diego Biurrun [Sat, 2 Aug 2014 13:14:55 +0000 (06:14 -0700)]
lcl: Disentangle pointers to input data and decompression buffer

This is cleaner and avoids a cast plus a related const qualifier warning.

5 years agox86/hevc_deblock: improve 8bit transpose store macros
James Almer [Sun, 3 Aug 2014 02:21:31 +0000 (23:21 -0300)]
x86/hevc_deblock: improve 8bit transpose store macros

Up to four instructions less depending on function and instruction set.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/tee: flip assigment direction
Michael Niedermayer [Sat, 2 Aug 2014 20:30:03 +0000 (22:30 +0200)]
avformat/tee: flip assigment direction

Found-by: CSA
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpeg12dec: fix vissible typo after 17c65651
Clément Bœsch [Sat, 2 Aug 2014 22:02:23 +0000 (00:02 +0200)]
avcodec/mpeg12dec: fix vissible typo after 17c65651

5 years agoavcodec/mpeg12dec: Document Ticket3809 fix
Michael Niedermayer [Sat, 2 Aug 2014 20:57:34 +0000 (22:57 +0200)]
avcodec/mpeg12dec: Document Ticket3809 fix

Suggested-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/error_resilience: make error an local variable where possible
Michael Niedermayer [Sat, 2 Aug 2014 20:04:08 +0000 (22:04 +0200)]
avcodec/error_resilience: make error an local variable where possible

This makes the code easier to understand as the scope of the variable is
smaller.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/error_resilience: comment out unused assignment
Michael Niedermayer [Sat, 2 Aug 2014 20:01:59 +0000 (22:01 +0200)]
avcodec/error_resilience: comment out unused  assignment

Its not removed as the code which uses this is out-commented too.

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotiff: Replace deprecated PIX_FMT names by modern ones
Diego Biurrun [Sat, 2 Aug 2014 15:47:46 +0000 (08:47 -0700)]
tiff: Replace deprecated PIX_FMT names by modern ones

5 years agodv: Update DV-profile-related functions to current public API
Diego Biurrun [Sat, 2 Aug 2014 15:45:01 +0000 (08:45 -0700)]
dv: Update DV-profile-related functions to current public API

5 years agoavcodec/mmvideo: remove unused return value and assignment
Michael Niedermayer [Sat, 2 Aug 2014 19:46:24 +0000 (21:46 +0200)]
avcodec/mmvideo: remove unused return value and assignment

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/avuienc: move pointer declaration to where its used
Michael Niedermayer [Sat, 2 Aug 2014 18:13:08 +0000 (20:13 +0200)]
avcodec/avuienc: move pointer declaration to where its used

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/lavfutils: remove redundant variable init
Michael Niedermayer [Sat, 2 Aug 2014 18:03:10 +0000 (20:03 +0200)]
avfilter/lavfutils: remove redundant variable init

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ffa4d4ef0bd66c4e8bde7357b69bdedc78123ea8'
Michael Niedermayer [Sat, 2 Aug 2014 17:40:18 +0000 (19:40 +0200)]
Merge commit 'ffa4d4ef0bd66c4e8bde7357b69bdedc78123ea8'

* commit 'ffa4d4ef0bd66c4e8bde7357b69bdedc78123ea8':
  ppc: fft: Build AltiVec optimizations in the standard way

Conflicts:
libavcodec/ppc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffserver: initialize pbuffer in prepare_sdp_description()
Michael Niedermayer [Sat, 2 Aug 2014 12:03:30 +0000 (14:03 +0200)]
ffserver: initialize pbuffer in prepare_sdp_description()

also check pbuffer before use

Found-by: CSA
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/wavpackenc: Fix log2sample() result value
Michael Niedermayer [Sat, 2 Aug 2014 16:15:12 +0000 (18:15 +0200)]
avcodec/wavpackenc: Fix log2sample() result value

Found-by: CSA
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/dtsdec: skip the first 4k in dts_probe()
Michael Niedermayer [Sat, 2 Aug 2014 15:25:04 +0000 (17:25 +0200)]
avformat/dtsdec: skip the first 4k in dts_probe()

DTS primarly needs to be separated from PCM, and PCM can contain cliping and
overshoots at the very start which can mimic DTS headers.

If this isnt sufficient then more of the DTS stream has to be decoded
and analyzed

Fixes ticket3784

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/dtsdec: fix signedness in reference pcm highpass in dts_probe()
Michael Niedermayer [Sat, 2 Aug 2014 15:23:03 +0000 (17:23 +0200)]
avformat/dtsdec: fix signedness in reference pcm highpass in dts_probe()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/dtsdec: count LE and BE separately in dts_probe()
Michael Niedermayer [Sat, 2 Aug 2014 15:21:03 +0000 (17:21 +0200)]
avformat/dtsdec: count LE and BE separately in dts_probe()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoppc: fft: Build AltiVec optimizations in the standard way
Diego Biurrun [Thu, 31 Jul 2014 11:46:50 +0000 (04:46 -0700)]
ppc: fft: Build AltiVec optimizations in the standard way

5 years agomsvc: fix implicitly declared read/close.
Matthew Oliver [Sat, 2 Aug 2014 01:08:29 +0000 (11:08 +1000)]
msvc: fix implicitly declared read/close.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc: move HEVCLocalContext declaration into loop
Michael Niedermayer [Sat, 2 Aug 2014 03:15:57 +0000 (05:15 +0200)]
avcodec/hevc: move HEVCLocalContext declaration into loop

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264_parser: remove redundant assignment
Michael Niedermayer [Sat, 2 Aug 2014 03:14:18 +0000 (05:14 +0200)]
avcodec/h264_parser: remove redundant assignment

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f0e959481968b6d906931127237ed981b6414f6e'
Michael Niedermayer [Sat, 2 Aug 2014 02:46:36 +0000 (04:46 +0200)]
Merge commit 'f0e959481968b6d906931127237ed981b6414f6e'

* commit 'f0e959481968b6d906931127237ed981b6414f6e':
  af_channelmap: Set the frame channel layout

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '87efaa97ceb0ad5820870855d6df3e569e6eac7e'
Michael Niedermayer [Sat, 2 Aug 2014 02:37:56 +0000 (04:37 +0200)]
Merge commit '87efaa97ceb0ad5820870855d6df3e569e6eac7e'

* commit '87efaa97ceb0ad5820870855d6df3e569e6eac7e':
  af_join: Set the output frame format

See: e0dd8cadcc386a168e7acd079463880154086446
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/format: Check for av_guess_format() failure
Michael Niedermayer [Sat, 2 Aug 2014 02:16:02 +0000 (04:16 +0200)]
avformat/format: Check for av_guess_format() failure

Fixes null pointer dereference
Fixes Ticket3812

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/format: use av_match_name() in av_guess_codec()
Michael Niedermayer [Sat, 2 Aug 2014 01:31:22 +0000 (03:31 +0200)]
avformat/format: use av_match_name() in av_guess_codec()

Fixes part of Ticket2236

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg_opt: Use av_guess_codec() instead of AVOutputFormat->*codec
Michael Niedermayer [Sat, 2 Aug 2014 01:29:42 +0000 (03:29 +0200)]
ffmpeg_opt: Use av_guess_codec() instead of AVOutputFormat->*codec

Fixes part of ticket2236

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dvdsub_parser: print message if packet is smaller than the packet size field
Michael Niedermayer [Fri, 1 Aug 2014 23:16:14 +0000 (01:16 +0200)]
avcodec/dvdsub_parser: print message if packet is smaller than the packet size field

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dvdsub_parser: Check buf_size before reading 32bit packet size
Michael Niedermayer [Fri, 1 Aug 2014 23:15:37 +0000 (01:15 +0200)]
avcodec/dvdsub_parser: Check buf_size before reading 32bit packet size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoaf_channelmap: Set the frame channel layout
Luca Barbato [Fri, 1 Aug 2014 21:32:40 +0000 (23:32 +0200)]
af_channelmap: Set the frame channel layout

Otherwise the frame would show the first layout matching the
channel count.

5 years agoaf_join: Set the output frame format
Luca Barbato [Fri, 1 Aug 2014 20:27:13 +0000 (22:27 +0200)]
af_join: Set the output frame format

5 years agoavcodec/dvdsub_parser: never return 0 when the input isnt 0
Michael Niedermayer [Fri, 1 Aug 2014 22:27:23 +0000 (00:27 +0200)]
avcodec/dvdsub_parser: never return 0 when the input isnt 0

Fixes a infinite loop
Fixes Ticket3804

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fa14804c83a7108a50c63d1f2180e30c75909529'
Michael Niedermayer [Fri, 1 Aug 2014 19:34:31 +0000 (21:34 +0200)]
Merge commit 'fa14804c83a7108a50c63d1f2180e30c75909529'

* commit 'fa14804c83a7108a50c63d1f2180e30c75909529':
  flv: Index the audio stream

Conflicts:
libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpeg12dec: fix support for interlaced mpeg2 with missing last slice
Michael Niedermayer [Fri, 1 Aug 2014 19:10:43 +0000 (21:10 +0200)]
avcodec/mpeg12dec: fix support for interlaced mpeg2 with missing last slice

Fixes Ticket3809

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpeg12dec: print the amount of overread
Michael Niedermayer [Fri, 1 Aug 2014 19:06:13 +0000 (21:06 +0200)]
avcodec/mpeg12dec: print the amount of overread

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264_mp4toannexb_bsf: rename first_idr to new_idr
Benoit Fouet [Fri, 1 Aug 2014 13:31:30 +0000 (15:31 +0200)]
h264_mp4toannexb_bsf: rename first_idr to new_idr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7ab551f9fd9a63586649a7df8790ddaeac55420f'
Michael Niedermayer [Fri, 1 Aug 2014 15:34:57 +0000 (17:34 +0200)]
Merge commit '7ab551f9fd9a63586649a7df8790ddaeac55420f'

* commit '7ab551f9fd9a63586649a7df8790ddaeac55420f':
  h264: prevent theoretical infinite loop in SEI parsing

Conflicts:
libavcodec/h264_sei.c

Not merged, as this would remove 2 bitstream compliance checks.
The specification does not allow the bitstream to end in the middle
of these variable length elements and we have no samples which
have such non compliant truncation either so its better to error
out. Which is simpler as well

This issue also has been fixed long ago
See: 9decfc17bb76da34734296048d390b176abf404c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b2e059a1ffbdaaa985c6a7dcdd684fa034725238'
Michael Niedermayer [Fri, 1 Aug 2014 14:56:42 +0000 (16:56 +0200)]
Merge commit 'b2e059a1ffbdaaa985c6a7dcdd684fa034725238'

* commit 'b2e059a1ffbdaaa985c6a7dcdd684fa034725238':
  pixdesc: K&R formatting cosmetics

Conflicts:
libavutil/pixdesc.c
libavutil/pixdesc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '92a36a6b3338df5f5cff573a486e182005367c24'
Michael Niedermayer [Fri, 1 Aug 2014 14:48:09 +0000 (16:48 +0200)]
Merge commit '92a36a6b3338df5f5cff573a486e182005367c24'

* commit '92a36a6b3338df5f5cff573a486e182005367c24':
  pngdec: correctly indent macros

Conflicts:
libavcodec/pngdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '52269f48e835a52023656f8330262ae70e6061c4'
Michael Niedermayer [Fri, 1 Aug 2014 14:39:22 +0000 (16:39 +0200)]
Merge commit '52269f48e835a52023656f8330262ae70e6061c4'

* commit '52269f48e835a52023656f8330262ae70e6061c4':
  Revert "vf_interlace: deprecate lowpass option"

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4da8cdbb91ddbac118b79076cad4dc28ba72e86f'
Michael Niedermayer [Fri, 1 Aug 2014 14:34:20 +0000 (16:34 +0200)]
Merge commit '4da8cdbb91ddbac118b79076cad4dc28ba72e86f'

* commit '4da8cdbb91ddbac118b79076cad4dc28ba72e86f':
  tscc: Eliminate pointless variable indirections in decode_frame()

Conflicts:
libavcodec/tscc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5735552f1f17ea01dcbc99b08f54b5bf52176a8f'
Michael Niedermayer [Fri, 1 Aug 2014 14:24:04 +0000 (16:24 +0200)]
Merge commit '5735552f1f17ea01dcbc99b08f54b5bf52176a8f'

* commit '5735552f1f17ea01dcbc99b08f54b5bf52176a8f':
  pngenc: Drop pointless pointer cast in png_write_row()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a786c8259dafeca9744252230b5d78f67810770c'
Michael Niedermayer [Fri, 1 Aug 2014 13:38:24 +0000 (15:38 +0200)]
Merge commit 'a786c8259dafeca9744252230b5d78f67810770c'

* commit 'a786c8259dafeca9744252230b5d78f67810770c':
  idct: Split off Xvid IDCT

Conflicts:
libavcodec/Makefile
libavcodec/mpeg4videodec.c
libavcodec/x86/Makefile
libavcodec/x86/idctdsp_init.c

This split is somewhat restructured leaving the xvid IDCT available
outside mpeg4 if manually selected.

The code also could not be merged unchanged as it conflicted with a
bugfix in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '03c9f357a4c2307a7913cea2cbf0ba817e80beb6'
Michael Niedermayer [Fri, 1 Aug 2014 13:11:05 +0000 (15:11 +0200)]
Merge commit '03c9f357a4c2307a7913cea2cbf0ba817e80beb6'

* commit '03c9f357a4c2307a7913cea2cbf0ba817e80beb6':
  ppc: idctdsp: Immediately return if no AltiVec is available

Conflicts:
libavcodec/ppc/idctdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoflv: Index the audio stream
Luca Barbato [Fri, 1 Aug 2014 01:03:20 +0000 (03:03 +0200)]
flv: Index the audio stream

And leverage the video index if the video is just disabled as wm4
did in an initial patch.

5 years agoMerge commit '706208ef47bffd525c982975d2756f7b2b220b8d'
Michael Niedermayer [Fri, 1 Aug 2014 12:33:16 +0000 (14:33 +0200)]
Merge commit '706208ef47bffd525c982975d2756f7b2b220b8d'

* commit '706208ef47bffd525c982975d2756f7b2b220b8d':
  fate: Split fate-pixdesc tests and dispatch them through Make

Conflicts:
tests/fate-run.sh
tests/ref/fate/filter-pixdesc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_pullup: 2nd try to workaround gcc 4.4.3 bug on arm
Michael Niedermayer [Fri, 1 Aug 2014 12:06:42 +0000 (14:06 +0200)]
avfilter/vf_pullup: 2nd try to workaround gcc 4.4.3 bug on arm

The first try failed to work with some build flags

The gcc version affected is very old and unmaintained AFAIK thus i made no
attempt to report this to the gcc developers.

The workaround is pushed as it may still affect users and does affect one
fate client

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264: prevent theoretical infinite loop in SEI parsing
Vittorio Giovara [Wed, 30 Jul 2014 18:33:36 +0000 (19:33 +0100)]
h264: prevent theoretical infinite loop in SEI parsing

Properly address CVE-2011-3946 and parse bitstream as described in the spec.

CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
5 years agopixdesc: K&R formatting cosmetics
Luca Barbato [Mon, 28 Jul 2014 20:28:13 +0000 (22:28 +0200)]
pixdesc: K&R formatting cosmetics

Also change some comments to multiline.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agopngdec: correctly indent macros
Vittorio Giovara [Thu, 31 Jul 2014 13:25:30 +0000 (14:25 +0100)]
pngdec: correctly indent macros

5 years agoRevert "vf_interlace: deprecate lowpass option"
Vittorio Giovara [Wed, 30 Jul 2014 20:12:14 +0000 (21:12 +0100)]
Revert "vf_interlace: deprecate lowpass option"

This reverts commit 35b05c5184fb3aa1191e2d1e7f1cae1e11f344a4.
A warning is introduced in case this option is used.

5 years agotscc: Eliminate pointless variable indirections in decode_frame()
Diego Biurrun [Tue, 29 Jul 2014 16:57:48 +0000 (09:57 -0700)]
tscc: Eliminate pointless variable indirections in decode_frame()

5 years agopngenc: Drop pointless pointer cast in png_write_row()
Diego Biurrun [Tue, 29 Jul 2014 15:43:40 +0000 (08:43 -0700)]
pngenc: Drop pointless pointer cast in png_write_row()

5 years agoFix standalone compilation of the WebVTT decoder.
Carl Eugen Hoyos [Fri, 1 Aug 2014 10:50:38 +0000 (12:50 +0200)]
Fix standalone compilation of the WebVTT decoder.

5 years agoAdd forgotten APIchanges entry for probesize2.
Carl Eugen Hoyos [Fri, 1 Aug 2014 10:49:56 +0000 (12:49 +0200)]
Add forgotten APIchanges entry for probesize2.

Update some git hashes.

5 years agoh264_mp4toannexb_bsf: always set idr_sps_pps_seen when SPS/PPS is seen.
Benoit Fouet [Thu, 31 Jul 2014 13:40:51 +0000 (15:40 +0200)]
h264_mp4toannexb_bsf: always set idr_sps_pps_seen when SPS/PPS is seen.

In order not to break a sequence like "SPS IDR SPS IDR", the boolean
telling that the SPS/PPS has been seen should always be set.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264: remove useless assignment.
Benoit Fouet [Thu, 31 Jul 2014 12:32:02 +0000 (14:32 +0200)]
h264: remove useless assignment.

source index, as well as dest one, is unconditionnaly set afterwards,
before being effectively used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoidct: Split off Xvid IDCT
Diego Biurrun [Mon, 21 Jul 2014 20:13:21 +0000 (13:13 -0700)]
idct: Split off Xvid IDCT

The Xvid IDCT is only required to decode some Xvid-encoded MPEG-4 files,
so there is no point in having it as an unconditional part of idctdsp.

5 years agoppc: idctdsp: Immediately return if no AltiVec is available
Diego Biurrun [Thu, 31 Jul 2014 11:48:07 +0000 (04:48 -0700)]
ppc: idctdsp: Immediately return if no AltiVec is available

This is how all the other init functions operate.

5 years agofate: Split fate-pixdesc tests and dispatch them through Make
Diego Biurrun [Tue, 29 Jul 2014 09:41:28 +0000 (02:41 -0700)]
fate: Split fate-pixdesc tests and dispatch them through Make

This allows running all the tests individually and/or in parallel.

5 years agoMerge commit 'd98e6c5d5d80c1dfe0c30f2e73d41a3aea0b920d'
Michael Niedermayer [Fri, 1 Aug 2014 01:36:17 +0000 (03:36 +0200)]
Merge commit 'd98e6c5d5d80c1dfe0c30f2e73d41a3aea0b920d'

* commit 'd98e6c5d5d80c1dfe0c30f2e73d41a3aea0b920d':
  pgssubdec: Check RLE size before copying

See: c0d68be555f5858703383040e04fcd6529777061
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopgssubdec: Check RLE size before copying
Michael Niedermayer [Thu, 31 Jul 2014 01:31:19 +0000 (21:31 -0400)]
pgssubdec: Check RLE size before copying

Make sure the buffer size does not exceed the expected
RLE size.

Prevent an out of array bound write.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Bug-Id: CVE-2013-0852

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agodoc/indevs: mention required configure options
Lou Logan [Thu, 31 Jul 2014 22:44:59 +0000 (14:44 -0800)]
doc/indevs: mention required configure options

For x11grab, libcdio, and libdc1394 input devices.

Signed-off-by: Lou Logan <lou@lrcd.com>
5 years agox86/hevc_deblock: use existing x86util transpose macro in chroma_{10, 12}
James Almer [Tue, 29 Jul 2014 21:07:27 +0000 (18:07 -0300)]
x86/hevc_deblock: use existing x86util transpose macro in chroma_{10, 12}

Cosmetic change. No measurable difference in speed.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavdevice/oss_audio: Check SNDCTL_DSP_GETFMTS failure, print a warning but continue
Michael Niedermayer [Thu, 31 Jul 2014 19:01:07 +0000 (21:01 +0200)]
avdevice/oss_audio: Check SNDCTL_DSP_GETFMTS failure, print a warning but continue

Found-by: CSA and Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/trim: remove duplicate assignment
Michael Niedermayer [Thu, 31 Jul 2014 18:53:15 +0000 (20:53 +0200)]
avfilter/trim: remove duplicate assignment

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/pixdesc: remove unneeded assignment
Michael Niedermayer [Thu, 31 Jul 2014 18:44:46 +0000 (20:44 +0200)]
avutil/pixdesc: remove unneeded assignment

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/diracdec: remove unneeded assignment
Michael Niedermayer [Thu, 31 Jul 2014 18:40:10 +0000 (20:40 +0200)]
avcodec/diracdec: remove unneeded assignment

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/flac_parser: remove duplicate assignent
Michael Niedermayer [Thu, 31 Jul 2014 18:35:32 +0000 (20:35 +0200)]
avcodec/flac_parser: remove duplicate assignent

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ratecontrol: remove unneeded statement
Michael Niedermayer [Thu, 31 Jul 2014 18:27:19 +0000 (20:27 +0200)]
avcodec/ratecontrol: remove unneeded statement

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodict.c: minor simplification.
Reimar Döffinger [Tue, 29 Jul 2014 19:23:14 +0000 (21:23 +0200)]
dict.c: minor simplification.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agov4l2enc: adding AVClass
Anshul Maheswhwari [Thu, 31 Jul 2014 15:29:59 +0000 (20:59 +0530)]
v4l2enc: adding AVClass

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/h264_parser: Increase parse_history, fix huge resolutions
Michael Niedermayer [Thu, 31 Jul 2014 14:25:21 +0000 (16:25 +0200)]
libavcodec/h264_parser: Increase parse_history, fix huge resolutions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264_mp4toannexb_bsf: account for consecutive IDR pictures.
Benoit Fouet [Thu, 31 Jul 2014 13:32:14 +0000 (15:32 +0200)]
h264_mp4toannexb_bsf: account for consecutive IDR pictures.

If there are consecutive IDR pictures, then SPS/PPS should be prepended
to all of them, not only the first one.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dvdsubdec: free subtitle rectangles if nothing is output
Michael Niedermayer [Thu, 31 Jul 2014 12:06:12 +0000 (14:06 +0200)]
avcodec/dvdsubdec: free subtitle rectangles if nothing is output

Fixes assertion failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/resample: check for malloc failure
Michael Niedermayer [Thu, 31 Jul 2014 11:04:28 +0000 (13:04 +0200)]
avcodec/resample: check for malloc failure

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pthread_slice: Check for malloc failure
Michael Niedermayer [Thu, 31 Jul 2014 10:55:41 +0000 (12:55 +0200)]
avcodec/pthread_slice: Check for malloc failure

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpeg4video_parser: Check for extradata parsing failure
Michael Niedermayer [Thu, 31 Jul 2014 03:20:42 +0000 (05:20 +0200)]
avcodec/mpeg4video_parser: Check for extradata parsing failure

Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: add very basic libcdio documentation
Gerion Entrup [Tue, 29 Jul 2014 23:53:32 +0000 (01:53 +0200)]
doc: add very basic libcdio documentation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hlsenc: add some empty lines to make the code easier to read
Nicolas Martyanoff [Fri, 18 Jul 2014 08:57:42 +0000 (10:57 +0200)]
avformat/hlsenc: add some empty lines to make the code easier to read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hlsenc: rename some identifers to make the code easier to read
Nicolas Martyanoff [Fri, 18 Jul 2014 08:57:42 +0000 (10:57 +0200)]
avformat/hlsenc: rename some identifers to make the code easier to read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hlsenc: Add some comments to make the code easier to read
Nicolas Martyanoff [Fri, 18 Jul 2014 08:57:42 +0000 (10:57 +0200)]
avformat/hlsenc: Add some comments to make the code easier to read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011'
Michael Niedermayer [Wed, 30 Jul 2014 21:34:18 +0000 (23:34 +0200)]
Merge commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011'

* commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011':
  configure: Globally add ZLIB_CONST to CPPFLAGS if zlib is enabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: Globally add ZLIB_CONST to CPPFLAGS if zlib is enabled
Diego Biurrun [Wed, 30 Jul 2014 12:10:18 +0000 (05:10 -0700)]
configure: Globally add ZLIB_CONST to CPPFLAGS if zlib is enabled

5 years agomovdec: remove nonsensical snprintf.
Reimar Döffinger [Tue, 29 Jul 2014 19:13:10 +0000 (21:13 +0200)]
movdec: remove nonsensical snprintf.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>