ffmpeg.git
5 years agoffmpeg: Do not fail if a demuxer and decoder use the same option identifer
Michael Niedermayer [Mon, 4 Aug 2014 11:32:11 +0000 (13:32 +0200)]
ffmpeg: Do not fail if a demuxer and decoder use the same option identifer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bb41115d56930b9f5d59e79dca254d1201246967'
Michael Niedermayer [Mon, 4 Aug 2014 10:41:15 +0000 (12:41 +0200)]
Merge commit 'bb41115d56930b9f5d59e79dca254d1201246967'

* commit 'bb41115d56930b9f5d59e79dca254d1201246967':
  imgutils: Do not declare avpriv_set_systematic_pal2 in the public header

Conflicts:
libavutil/internal.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoimgutils: Do not declare avpriv_set_systematic_pal2 in the public header
Diego Biurrun [Sun, 3 Aug 2014 18:06:06 +0000 (11:06 -0700)]
imgutils: Do not declare avpriv_set_systematic_pal2 in the public header

5 years agoMerge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a'
Michael Niedermayer [Mon, 4 Aug 2014 03:44:00 +0000 (05:44 +0200)]
Merge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a'

* commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a':
  avcodec: Deprecate dtg_active_format field in favor of avframe side-data

Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/mpeg12dec.c
libavcodec/version.h
libavfilter/vf_showinfo.c
libavutil/frame.h
libavutil/version.h

See: 2a3c36e920d958e99fb4edf065a6713c30f2c2a9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoDeprecate AFD field and add AFD as side-data
Kieran Kunhya [Sun, 3 Aug 2014 18:24:56 +0000 (19:24 +0100)]
Deprecate AFD field and add AFD as side-data

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd0393d79bc3d61c9f2ff832c0e273b7774ff0269'
Michael Niedermayer [Mon, 4 Aug 2014 03:08:01 +0000 (05:08 +0200)]
Merge commit 'd0393d79bc3d61c9f2ff832c0e273b7774ff0269'

* commit 'd0393d79bc3d61c9f2ff832c0e273b7774ff0269':
  huffyuv: Check and propagate function return values

Conflicts:
libavcodec/huffyuvdec.c

See: f67a0d115254461649470452058fa3c28c0df294
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6234058148d6e1ee765913b678a22385a87bffac'
Michael Niedermayer [Mon, 4 Aug 2014 02:57:50 +0000 (04:57 +0200)]
Merge commit '6234058148d6e1ee765913b678a22385a87bffac'

* commit '6234058148d6e1ee765913b678a22385a87bffac':
  huffyuv: Return proper error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3160bdc7f7bc27bb67561270b4e730cd2d844afd'
Michael Niedermayer [Mon, 4 Aug 2014 02:53:23 +0000 (04:53 +0200)]
Merge commit '3160bdc7f7bc27bb67561270b4e730cd2d844afd'

* commit '3160bdc7f7bc27bb67561270b4e730cd2d844afd':
  huffyuv: Use avpriv_report_missing_feature() where appropriate

Conflicts:
libavcodec/huffyuvdec.c

Not merged, the error messages are not about missing support of features
of the input file. avpriv_report_missing_feature() speaks about
"... your file has a feature which has not been implemented"
Thats would simply not be correct

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b7616f5716dce68c749d5dfeab19cf595a11807c'
Michael Niedermayer [Mon, 4 Aug 2014 02:42:04 +0000 (04:42 +0200)]
Merge commit 'b7616f5716dce68c749d5dfeab19cf595a11807c'

* commit 'b7616f5716dce68c749d5dfeab19cf595a11807c':
  huffyuv: Eliminate some pointless casts

Conflicts:
libavcodec/huffyuvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c065f4a0c652cc569c927c95148111b3aa2962dc'
Michael Niedermayer [Mon, 4 Aug 2014 02:34:17 +0000 (04:34 +0200)]
Merge commit 'c065f4a0c652cc569c927c95148111b3aa2962dc'

* commit 'c065f4a0c652cc569c927c95148111b3aa2962dc':
  huffyuv: K&R formatting cosmetics

Conflicts:
libavcodec/huffyuvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f89d76c10355242c39b08f253c1d1524f45ef778'
Michael Niedermayer [Mon, 4 Aug 2014 02:14:43 +0000 (04:14 +0200)]
Merge commit 'f89d76c10355242c39b08f253c1d1524f45ef778'

* commit 'f89d76c10355242c39b08f253c1d1524f45ef778':
  mpeg4video: Initialize xvididct for all threads

Conflicts:
libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a238b83b13640e3192d7d4aaad2242f13a9a84a1'
Michael Niedermayer [Mon, 4 Aug 2014 02:06:30 +0000 (04:06 +0200)]
Merge commit 'a238b83b13640e3192d7d4aaad2242f13a9a84a1'

* commit 'a238b83b13640e3192d7d4aaad2242f13a9a84a1':
  aarch64: use MACH-O const data asm directive in const macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ac6b95dbc0b53b3ea461bd5e5e7f7f31d2983733'
Michael Niedermayer [Mon, 4 Aug 2014 02:06:06 +0000 (04:06 +0200)]
Merge commit 'ac6b95dbc0b53b3ea461bd5e5e7f7f31d2983733'

* commit 'ac6b95dbc0b53b3ea461bd5e5e7f7f31d2983733':
  aarch64: add ',' between assembler macro arguments where missing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'caf5ef852bf71984d3322bbeaf48cfb04ac8255f'
Michael Niedermayer [Mon, 4 Aug 2014 02:05:25 +0000 (04:05 +0200)]
Merge commit 'caf5ef852bf71984d3322bbeaf48cfb04ac8255f'

* commit 'caf5ef852bf71984d3322bbeaf48cfb04ac8255f':
  cpu-test: test av_cpu_count

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '07d8fa58121be8fe315bd51ab760547fe209a745'
Michael Niedermayer [Mon, 4 Aug 2014 01:51:17 +0000 (03:51 +0200)]
Merge commit '07d8fa58121be8fe315bd51ab760547fe209a745'

* commit '07d8fa58121be8fe315bd51ab760547fe209a745':
  fate: add informative cpu test

Conflicts:
tests/fate/libavutil.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6a463e7fb4f028c52d2e2d054f9483f4fff492bc'
Michael Niedermayer [Mon, 4 Aug 2014 01:39:39 +0000 (03:39 +0200)]
Merge commit '6a463e7fb4f028c52d2e2d054f9483f4fff492bc'

* commit '6a463e7fb4f028c52d2e2d054f9483f4fff492bc':
  http: Refactor http_open_cnx

See: c2a170ac0ddd53516d004cd2bf55ceaffa59642a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/http: fix tls/tcp protocol after a 302 move in https
Rodger Combs [Sat, 2 Aug 2014 00:37:27 +0000 (20:37 -0400)]
avformat/http: fix tls/tcp protocol after a 302 move in https

Fixes ticket 3824

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswresample/swresample: Treat mono as planar
Michael Niedermayer [Mon, 4 Aug 2014 01:05:05 +0000 (03:05 +0200)]
swresample/swresample: Treat mono as planar

This might in some cases improve performance.

Idea from: fbc0b8659967ea54a8472b5f795270d38bb085dd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd'
Michael Niedermayer [Mon, 4 Aug 2014 00:49:43 +0000 (02:49 +0200)]
Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd'

* commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd':
  lavr: Do not change the sample format for mono audio

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/mem: document NULL related saftey of av_freep()
Michael Niedermayer [Mon, 4 Aug 2014 00:34:54 +0000 (02:34 +0200)]
avutil/mem: document NULL related saftey of av_freep()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: Deprecate dtg_active_format field in favor of avframe side-data
Kieran Kunhya [Sun, 3 Aug 2014 18:24:56 +0000 (19:24 +0100)]
avcodec: Deprecate dtg_active_format field in favor of avframe side-data

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agohuffyuv: Check and propagate function return values
Diego Biurrun [Sun, 3 Aug 2014 19:19:10 +0000 (12:19 -0700)]
huffyuv: Check and propagate function return values

Bug-Id: CVE-2013-0868

inspired by a patch from Michael Niedermayer <michaelni@gmx.at>
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Diego Biurrun <diego@biurrun.de>
CC: libav-stable@libav.org
5 years agohuffyuv: Return proper error codes
Diego Biurrun [Sun, 3 Aug 2014 18:22:20 +0000 (11:22 -0700)]
huffyuv: Return proper error codes

5 years agohuffyuv: Use avpriv_report_missing_feature() where appropriate
Diego Biurrun [Sun, 3 Aug 2014 18:02:22 +0000 (11:02 -0700)]
huffyuv: Use avpriv_report_missing_feature() where appropriate

5 years agohuffyuv: Eliminate some pointless casts
Diego Biurrun [Sun, 3 Aug 2014 17:57:01 +0000 (10:57 -0700)]
huffyuv: Eliminate some pointless casts

5 years agohuffyuv: K&R formatting cosmetics
Diego Biurrun [Sun, 3 Aug 2014 17:49:40 +0000 (10:49 -0700)]
huffyuv: K&R formatting cosmetics

5 years agompeg4video: Initialize xvididct for all threads
Anton Khirnov [Sun, 3 Aug 2014 11:59:03 +0000 (04:59 -0700)]
mpeg4video: Initialize xvididct for all threads

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoaarch64: use MACH-O const data asm directive in const macro
Janne Grunau [Wed, 23 Jul 2014 08:06:15 +0000 (10:06 +0200)]
aarch64: use MACH-O const data asm directive in const macro

5 years agoaarch64: add ',' between assembler macro arguments where missing
Janne Grunau [Thu, 24 Jul 2014 12:50:46 +0000 (14:50 +0200)]
aarch64: add ',' between assembler macro arguments where missing

llvm's integrated assembler does not accept spaces as macro argument
delimiter when targeting darwin. Using a explicit delimiter is a good
idea in principle since it makes case like 'macro 4 -2' vs 'macro 4 - 2'
clear.

5 years agocpu-test: test av_cpu_count
Janne Grunau [Sun, 3 Aug 2014 11:03:13 +0000 (13:03 +0200)]
cpu-test: test av_cpu_count

Add CPU count and number threads as informative values for fate.

5 years agofate: add informative cpu test
Janne Grunau [Thu, 30 Jan 2014 12:48:35 +0000 (13:48 +0100)]
fate: add informative cpu test

libavutil/cpu-test prints raw and effective cpu flags to STDERR. Detected
cpu flags can be useful for debugging fate errors.

No comparison of the result against a expected result since that would
require fate config specific references.

5 years agoavfilter/vf_spp: Use dct->get_pixels()
Michael Niedermayer [Sun, 3 Aug 2014 21:36:01 +0000 (23:36 +0200)]
avfilter/vf_spp: Use dct->get_pixels()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/avdct: Add get_pixels()
Michael Niedermayer [Sat, 2 Aug 2014 18:59:24 +0000 (20:59 +0200)]
avcodec/avdct: Add get_pixels()

Suggested-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohttp: Refactor http_open_cnx
Luca Barbato [Sat, 2 Aug 2014 11:29:02 +0000 (13:29 +0200)]
http: Refactor http_open_cnx

Split return value handling from the actual opening.

Incidentally fixes the https -> http redirect issue reported by
Compn on behalf of rcombs.

CC: libav-stable@libav.org
5 years agolavr: Do not change the sample format for mono audio
Justin Ruggles [Fri, 18 Jul 2014 21:39:01 +0000 (17:39 -0400)]
lavr: Do not change the sample format for mono audio

This treats mono as planar internally within libavresample rather
than changing the sample format.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoMerge commit '9f17685dfb70a73823aca16ad246ee3b831d1de8'
Michael Niedermayer [Sun, 3 Aug 2014 18:53:00 +0000 (20:53 +0200)]
Merge commit '9f17685dfb70a73823aca16ad246ee3b831d1de8'

* commit '9f17685dfb70a73823aca16ad246ee3b831d1de8':
  avcodec: Deprecate unused defines and options

Conflicts:
doc/APIchanges
libavcodec/version.h

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

* commit 'bad81800bb51f43d28d656abf5d45b477e3b3198':
  avcodec: options: Add missing deprecation ifdefs around emu_edge

Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 agoavcodec: Deprecate unused defines and options
Diego Biurrun [Fri, 25 Jul 2014 23:00:33 +0000 (16:00 -0700)]
avcodec: Deprecate unused defines and options

5 years agoavcodec: options: Add missing deprecation ifdefs around emu_edge
Diego Biurrun [Sat, 2 Aug 2014 19:37:49 +0000 (12:37 -0700)]
avcodec: options: Add missing deprecation ifdefs around emu_edge

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>