ffmpeg.git
5 years agox86/simple_idct: use LOCAL_ALIGNED instead of DECLARE_ALIGNED
Paul B Mahol [Mon, 2 Sep 2013 22:02:59 +0000 (22:02 +0000)]
x86/simple_idct: use LOCAL_ALIGNED instead of DECLARE_ALIGNED

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agolavfi/mp: remove mp=phase
Paul B Mahol [Tue, 3 Sep 2013 12:46:28 +0000 (12:46 +0000)]
lavfi/mp: remove mp=phase

The filter was ported to a native libavfilter filter.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agolavfi: port phase filter from libmpcodecs
Paul B Mahol [Sat, 31 Aug 2013 18:46:17 +0000 (18:46 +0000)]
lavfi: port phase filter from libmpcodecs

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/vcr1: simplify code drop buf variable
Michael Niedermayer [Tue, 3 Sep 2013 13:47:21 +0000 (15:47 +0200)]
avcodec/vcr1: simplify code drop buf variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vcr1: simplify code, drop buf_size
Michael Niedermayer [Tue, 3 Sep 2013 13:46:56 +0000 (15:46 +0200)]
avcodec/vcr1: simplify code, drop buf_size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vcr1: return the actual number of consumed bytes
Michael Niedermayer [Tue, 3 Sep 2013 13:44:37 +0000 (15:44 +0200)]
avcodec/vcr1: return the actual number of consumed bytes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 3 Sep 2013 13:18:43 +0000 (15:18 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Don't flush after each written packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7df9e693a34c84c698da60426c78140c950f95ed'
Michael Niedermayer [Tue, 3 Sep 2013 13:05:00 +0000 (15:05 +0200)]
Merge commit '7df9e693a34c84c698da60426c78140c950f95ed'

* commit '7df9e693a34c84c698da60426c78140c950f95ed':
  cosmetics: Fix ATRAC codec name spelling

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '488b2984fece7ad0c2596826fee18e74aa904667'
Michael Niedermayer [Tue, 3 Sep 2013 12:57:47 +0000 (14:57 +0200)]
Merge commit '488b2984fece7ad0c2596826fee18e74aa904667'

* commit '488b2984fece7ad0c2596826fee18e74aa904667':
  ape demuxer: check for EOF in potentially long loops

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a7c1689dedd11689edb30088d467ac03f9b8d1cf'
Michael Niedermayer [Tue, 3 Sep 2013 12:50:31 +0000 (14:50 +0200)]
Merge commit 'a7c1689dedd11689edb30088d467ac03f9b8d1cf'

* commit 'a7c1689dedd11689edb30088d467ac03f9b8d1cf':
  4xm: check that bits per sample is strictly positive

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: Fix bitrate overflow check
Michael Niedermayer [Tue, 3 Sep 2013 12:36:12 +0000 (14:36 +0200)]
avformat/utils: Fix bitrate overflow check

The check added in df33a58e5311ee9a64a573889b883a80e981af7b does not work
at all, rather it broke the summing of bitrates completely.
The comparission was wrong way around.
This commit replaces it by a simpler and hopefully clearer check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'df33a58e5311ee9a64a573889b883a80e981af7b'
Michael Niedermayer [Tue, 3 Sep 2013 12:28:49 +0000 (14:28 +0200)]
Merge commit 'df33a58e5311ee9a64a573889b883a80e981af7b'

* commit 'df33a58e5311ee9a64a573889b883a80e981af7b':
  lavf: avoid integer overflow when estimating bitrate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303'
Michael Niedermayer [Tue, 3 Sep 2013 12:16:42 +0000 (14:16 +0200)]
Merge commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303'

* commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303':
  lavf: move a variable declaration to the block where it's used

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoriff: add 0x64 to g726 works on g726-test1.wav
Compn [Tue, 3 Sep 2013 12:25:43 +0000 (08:25 -0400)]
riff: add 0x64 to g726 works on g726-test1.wav

5 years agoMerge commit 'fe9bb61f9a16be19ad91875632c39e44b7a99a8a'
Michael Niedermayer [Tue, 3 Sep 2013 12:14:12 +0000 (14:14 +0200)]
Merge commit 'fe9bb61f9a16be19ad91875632c39e44b7a99a8a'

* commit 'fe9bb61f9a16be19ad91875632c39e44b7a99a8a':
  pictordec: pass correct context to avpriv_request_sample

Conflicts:
libavcodec/pictordec.c

No change as the avpriv_request_sample() has already been replaced by an implementation
of the codepath.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5f7aecde02a95451e514c809f2794c1deba80695'
Michael Niedermayer [Tue, 3 Sep 2013 12:00:28 +0000 (14:00 +0200)]
Merge commit '5f7aecde02a95451e514c809f2794c1deba80695'

* commit '5f7aecde02a95451e514c809f2794c1deba80695':
  pictordec: break out of both decoding loops when y drops below 0

Conflicts:
libavcodec/pictordec.c

The added check is redundant.
It shows the error path more clearly though

See: f3f488423a12af9bb4eed6e6868cfa86ece3571b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vcr1: replace redundant checks from libav (8aba7968dd604aae91ee42cbce0be3dad7...
Michael Niedermayer [Tue, 3 Sep 2013 11:36:22 +0000 (13:36 +0200)]
avcodec/vcr1: replace redundant checks from libav (8aba7968dd604aae91ee42cbce0be3dad7dceb30)  by asserts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8aba7968dd604aae91ee42cbce0be3dad7dceb30'
Michael Niedermayer [Tue, 3 Sep 2013 11:17:20 +0000 (13:17 +0200)]
Merge commit '8aba7968dd604aae91ee42cbce0be3dad7dceb30'

* commit '8aba7968dd604aae91ee42cbce0be3dad7dceb30':
  vcr1: add sanity checks

Conflicts:
libavcodec/vcr1.c

See: 845724c82c1a732ab398c9e8cedd178f96f1626d
See: 8e09482e4d27d65bbce2ce5c2f4392216011ed09
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomovenc: Don't flush after each written packet
Martin Storsjö [Mon, 2 Sep 2013 13:23:17 +0000 (16:23 +0300)]
movenc: Don't flush after each written packet

This should improve write performance quite significantly.
---
Tested with both writing a normal mp4, by using the faststart
feature and writing a fragmented mp4 file; all turn out with the
same md5sum as before.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavfilter/vf_yadif: reallocate frames if strides differ
Michael Niedermayer [Tue, 3 Sep 2013 02:40:04 +0000 (04:40 +0200)]
avfilter/vf_yadif: reallocate frames if strides differ

Fixes Ticket2896

An alternative to this would be to change the code to support any
stride.
The condition of differing strides should be rare.
If theres no speedloss supporting any stride would be better

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/fifo: assert that theres enough data in the fifo on drain calls.
Michael Niedermayer [Tue, 3 Sep 2013 01:05:41 +0000 (03:05 +0200)]
avutil/fifo: assert that theres enough data in the fifo on drain calls.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agow64dec: fix end position of summarylist guid
Paul B Mahol [Tue, 3 Sep 2013 01:03:10 +0000 (01:03 +0000)]
w64dec: fix end position of summarylist guid

Noticed-by: James Almer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agow64dec: fix skipping of unknown guids
Paul B Mahol [Mon, 2 Sep 2013 22:50:00 +0000 (22:50 +0000)]
w64dec: fix skipping of unknown guids

Regression since 14d50c1.
Fixes #2932.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavpacket: Fixing side data copy when src == dst
Vignesh Venkatasubramanian [Mon, 2 Sep 2013 17:42:22 +0000 (10:42 -0700)]
avpacket: Fixing side data copy when src == dst

Fixing av_packet_copy_side_data to work correctly when source and
destination are the same. This makes sure that there is no memory
leak and double frees.

Signed-off by: Vignesh Venkatasubramanian <vigneshv@google.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocosmetics: Fix ATRAC codec name spelling
Diego Biurrun [Mon, 2 Sep 2013 18:21:49 +0000 (20:21 +0200)]
cosmetics: Fix ATRAC codec name spelling

5 years agoape demuxer: check for EOF in potentially long loops
Anton Khirnov [Sat, 24 Aug 2013 19:30:46 +0000 (21:30 +0200)]
ape demuxer: check for EOF in potentially long loops

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
5 years ago4xm: check that bits per sample is strictly positive
Anton Khirnov [Sat, 24 Aug 2013 19:30:46 +0000 (21:30 +0200)]
4xm: check that bits per sample is strictly positive

Avoids a divide by zero.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
5 years agolavf: avoid integer overflow when estimating bitrate
Anton Khirnov [Sat, 24 Aug 2013 19:30:46 +0000 (21:30 +0200)]
lavf: avoid integer overflow when estimating bitrate

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
5 years agolavf: move a variable declaration to the block where it's used
Anton Khirnov [Sun, 25 Aug 2013 09:53:34 +0000 (11:53 +0200)]
lavf: move a variable declaration to the block where it's used

5 years agopictordec: pass correct context to avpriv_request_sample
Anton Khirnov [Sat, 24 Aug 2013 19:30:46 +0000 (21:30 +0200)]
pictordec: pass correct context to avpriv_request_sample

Fixes invalid reads.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
5 years agopictordec: break out of both decoding loops when y drops below 0
Anton Khirnov [Sat, 24 Aug 2013 19:30:46 +0000 (21:30 +0200)]
pictordec: break out of both decoding loops when y drops below 0

Otherwise picmemset can get called with negative y, resulting in an
invalid write.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
5 years agovcr1: add sanity checks
Anton Khirnov [Sat, 24 Aug 2013 19:30:46 +0000 (21:30 +0200)]
vcr1: add sanity checks

Fixes invalid reads with corrupted files.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
5 years agoavformat/movenc: Use the rate from av_timecode_init_from_string() for tmcd
Michael Niedermayer [Mon, 2 Sep 2013 14:33:02 +0000 (16:33 +0200)]
avformat/movenc: Use the rate from av_timecode_init_from_string() for tmcd

Fixes Ticket2892
Reveiwed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pnmdec: fix unaligned read
Michael Niedermayer [Mon, 2 Sep 2013 10:32:32 +0000 (12:32 +0200)]
avcodec/pnmdec: fix unaligned read

Fixes fate-lavf-pam on alpha

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pnmdec: use a more specific pointer type than void in samplecpy()
Michael Niedermayer [Mon, 2 Sep 2013 10:31:55 +0000 (12:31 +0200)]
avcodec/pnmdec: use a more specific pointer type than void in samplecpy()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAvoid a deadlock when decoding wma.
Carl Eugen Hoyos [Mon, 2 Sep 2013 06:32:24 +0000 (08:32 +0200)]
Avoid a deadlock when decoding wma.

Fixes ticket #2925.

5 years agoavfilter/vf_fps: make sure the fifo is not empty before using it
Michael Niedermayer [Mon, 2 Sep 2013 02:32:23 +0000 (04:32 +0200)]
avfilter/vf_fps: make sure the fifo is not empty before using it

Fixes Ticket2905

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc: add teletext decoder using libzvbi
Marton Balint [Sun, 1 Sep 2013 21:05:50 +0000 (23:05 +0200)]
lavc: add teletext decoder using libzvbi

Based on a patch by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>.
http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2012-December/136677.html

The original patch was rebased by Tudor SUCIU <tudor.suciu@gmail.com>.

Lots of additional features and fixes are made by me.

Fixes ticket #2086.

Changes since last version:
- change default page to all pages

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sun, 1 Sep 2013 22:59:30 +0000 (00:59 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Read h264 headers from v4l2 to allow stream-copying.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ffv1dec: reorganize thread init/update
Michael Niedermayer [Sun, 1 Sep 2013 20:38:43 +0000 (22:38 +0200)]
avcodec/ffv1dec: reorganize thread init/update

This moves some allocations to init, reducing possible failure modes in update.
Always copies from the previous context instead of just during init

Fixes Ticket2923

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ffv1dec: move initial_states init to init_thread_copy()
Michael Niedermayer [Sun, 1 Sep 2013 17:29:38 +0000 (19:29 +0200)]
avcodec/ffv1dec: move initial_states init to init_thread_copy()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRead h264 headers from v4l2 to allow stream-copying.
Carl Eugen Hoyos [Sun, 1 Sep 2013 18:20:47 +0000 (20:20 +0200)]
Read h264 headers from v4l2 to allow stream-copying.

Fixes ticket #2882.
Analyzed and tested by William C Bonner.

5 years agopcm-dvd: use av_freep()
Paul B Mahol [Sun, 1 Sep 2013 19:20:39 +0000 (19:20 +0000)]
pcm-dvd: use av_freep()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agopcm-dvd: remove redundant log message
Paul B Mahol [Sun, 1 Sep 2013 19:19:31 +0000 (19:19 +0000)]
pcm-dvd: remove redundant log message

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agodoc: fix insane hard texi2html dependancy
Michael Niedermayer [Sun, 1 Sep 2013 17:56:52 +0000 (19:56 +0200)]
doc: fix insane hard texi2html dependancy

Found-by: nevcairiel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopixfmt: add native bayer 16bit formats
Michael Niedermayer [Sat, 5 Jan 2013 03:58:19 +0000 (04:58 +0100)]
pixfmt: add native bayer 16bit formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavutil: add AV_PIX_FMT_BAYER pixel formats
Peter Ross [Sun, 16 Dec 2012 01:48:39 +0000 (12:48 +1100)]
libavutil: add AV_PIX_FMT_BAYER pixel formats

The pixel format descriptors are set to more or less arbitrary
values as bayer formats do not fit in the descriptors structure.
These values are currently not used for bayer formats and thus
do not matter.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 1 Sep 2013 12:09:17 +0000 (14:09 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pcm-dvd: Fix build on big endian

See: 789cd1de99cd272c02b2d960cfa08f9ecfe981d7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c'
Michael Niedermayer [Sun, 1 Sep 2013 11:41:33 +0000 (13:41 +0200)]
Merge commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c'

* commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c':
  configure: Add docdir configuration option

Conflicts:
configure
doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'faa8245bd45c1a6dd220ba9407ea1c82132aa1ce'
Michael Niedermayer [Sun, 1 Sep 2013 11:07:40 +0000 (13:07 +0200)]
Merge commit 'faa8245bd45c1a6dd220ba9407ea1c82132aa1ce'

* commit 'faa8245bd45c1a6dd220ba9407ea1c82132aa1ce':
  vf_lut: Constantize

Conflicts:
libavfilter/vf_lut.c

See: d7e95ccd9ff3e55e194582a105421fa308a83ef1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pcm-dvd: discard buffer if block size changed
Michael Niedermayer [Sun, 1 Sep 2013 10:36:51 +0000 (12:36 +0200)]
avcodec/pcm-dvd: discard buffer if block size changed

This prevents a potential crash

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopcm-dvd: Fix build on big endian
Martin Storsjö [Sat, 31 Aug 2013 15:35:33 +0000 (17:35 +0200)]
pcm-dvd: Fix build on big endian

Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9'
Michael Niedermayer [Sun, 1 Sep 2013 11:00:08 +0000 (13:00 +0200)]
Merge commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9'

* commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9':
  pcm_dvd: consolidate pieces from pcm.c and mpeg.c

Conflicts:
libavcodec/pcm.c
libavcodec/version.h
libavformat/mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: update fate tests after master:291ad12ea2d1: ffprobe: show probe_score in the...
Michael Niedermayer [Sun, 1 Sep 2013 10:53:24 +0000 (12:53 +0200)]
fate: update fate tests after master:291ad12ea2d1: ffprobe: show probe_score in the format section

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffprobe: show probe_score in the format section
Stefano Sabatini [Wed, 28 Aug 2013 22:28:26 +0000 (00:28 +0200)]
ffprobe: show probe_score in the format section

Should address trac ticket #2621.

5 years agoffprobe: fix format section XML validation
Stefano Sabatini [Sun, 1 Sep 2013 09:28:56 +0000 (11:28 +0200)]
ffprobe: fix format section XML validation

It was broken since 2186a7e547fdda716138444c8345ce8b823f2d4a.

5 years agoavcodec/h264: set er.ref_count earlier
Michael Niedermayer [Sun, 1 Sep 2013 01:40:20 +0000 (03:40 +0200)]
avcodec/h264: set er.ref_count earlier

Fixes Ticket2910

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/error_resilience: change out commented printf() to av_log()
Michael Niedermayer [Sun, 1 Sep 2013 01:44:19 +0000 (03:44 +0200)]
avcodec/error_resilience: change out commented printf() to av_log()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: fix duration_fields calculation when need_parsing=0
Michael Niedermayer [Sat, 31 Aug 2013 22:46:14 +0000 (00:46 +0200)]
avformat/utils: fix duration_fields calculation when need_parsing=0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/lxfdec: use a parser to parse video frame headers
Michael Niedermayer [Sat, 31 Aug 2013 22:21:37 +0000 (00:21 +0200)]
avformat/lxfdec: use a parser to parse video frame headers

lxf needs a parser (or would need to set a few fields explicitly).
Fixes Ticket2917

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopcm-dvd: Fix build on big endian
Martin Storsjö [Sat, 31 Aug 2013 15:35:33 +0000 (17:35 +0200)]
pcm-dvd: Fix build on big endian

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavcodec/utils: avcodec_string: print colorspace type
Michael Niedermayer [Tue, 27 Aug 2013 20:04:38 +0000 (22:04 +0200)]
avcodec/utils: avcodec_string: print colorspace type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: avcodec_string: Print color_range
Michael Niedermayer [Tue, 27 Aug 2013 20:04:00 +0000 (22:04 +0200)]
avcodec/utils: avcodec_string: Print color_range

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: avcodec_string: make the colorspace printing code more extendible.
Michael Niedermayer [Tue, 27 Aug 2013 20:02:45 +0000 (22:02 +0200)]
avcodec/utils: avcodec_string: make the colorspace printing code more extendible.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: Add docdir configuration option
Vittorio Giovara [Wed, 28 Aug 2013 08:30:14 +0000 (10:30 +0200)]
configure: Add docdir configuration option

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agovf_lut: Constantize
Diego Elio Pettenò [Sat, 31 Aug 2013 10:30:16 +0000 (03:30 -0700)]
vf_lut: Constantize

The pixel format tables are never modified, mark them as constant.

Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sat, 31 Aug 2013 11:55:34 +0000 (13:55 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix make checkheaders for wavpackenc.h
  Fix make checkheaders for vdpau_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 31 Aug 2013 11:47:04 +0000 (13:47 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pcm_bluray: cosmetics

Conflicts:
libavcodec/pcm-bluray.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f'
Michael Niedermayer [Sat, 31 Aug 2013 11:35:52 +0000 (13:35 +0200)]
Merge commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f'

* commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f':
  pcm_bluray: rename pcm-mpeg.c to pcm-bluray.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix make checkheaders for wavpackenc.h
Carl Eugen Hoyos [Sat, 31 Aug 2013 11:32:43 +0000 (13:32 +0200)]
Fix make checkheaders for wavpackenc.h

5 years agoFix make checkheaders for vdpau_internal.h
Carl Eugen Hoyos [Sat, 31 Aug 2013 11:32:13 +0000 (13:32 +0200)]
Fix make checkheaders for vdpau_internal.h

5 years agopcm_dvd: consolidate pieces from pcm.c and mpeg.c
Christian Schmidt [Fri, 30 Aug 2013 16:15:47 +0000 (18:15 +0200)]
pcm_dvd: consolidate pieces from pcm.c and mpeg.c

Remove the header decoding for PCM audio from mpeg.c and the
20/24bit parts from pcm.c and merge them into a new decoder in
pcm-dvd.c.

The decoder has added support for samples that span multiple
packets and modified 20/24bit group decoding. Both is needed to
decode samples that have been generated with DVD-Lab Pro 2. The
decoding of 16bit PCM and two channel 24bit is identical to
before. No other samples are known to verify the correctness of
the encoding this software does.
The complete list of tested formats is
48kHz/16bit/2-8 channels
48kHz/24bit/2-5 channels
96kHz/16bit/2-4 channels
96kHz/24bit/2 channels

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agopcm_bluray: cosmetics
Christian Schmidt [Fri, 30 Aug 2013 16:15:46 +0000 (18:15 +0200)]
pcm_bluray: cosmetics

5 years agopcm_bluray: rename pcm-mpeg.c to pcm-bluray.c
Christian Schmidt [Fri, 30 Aug 2013 16:15:44 +0000 (18:15 +0200)]
pcm_bluray: rename pcm-mpeg.c to pcm-bluray.c

The original idea was to collect PCM codecs that could appear in various
MPEG streams in this file. Discussion in IRC lead to the conclusion that
one codec per file would be better and stop the need for #ifdefs.

5 years agoavformat/avidec: match first index and first packet size=0 handling
Michael Niedermayer [Sat, 31 Aug 2013 01:08:25 +0000 (03:08 +0200)]
avformat/avidec: match first index and first packet size=0 handling

Fixes Ticket2861

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dsputil: fix signedness in sizeof() comparissions
Michael Niedermayer [Fri, 30 Aug 2013 21:40:47 +0000 (23:40 +0200)]
avcodec/dsputil: fix signedness in sizeof() comparissions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdsp: fix (un)signed type in end comparission
Michael Niedermayer [Fri, 30 Aug 2013 21:14:32 +0000 (23:14 +0200)]
avcodec/pngdsp: fix (un)signed type in end comparission

Fixes out of array accesses
Fixes Ticket2919

Found_by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavu/bprint: add append buffer function
Lukasz Marek [Fri, 23 Aug 2013 21:21:50 +0000 (23:21 +0200)]
lavu/bprint: add append buffer function

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Reveiwed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/avpacket: Use av_free_packet() in error cleanups
Michael Niedermayer [Fri, 30 Aug 2013 18:57:55 +0000 (20:57 +0200)]
avcodec/avpacket: Use av_free_packet() in error cleanups

This prevents memleaks on errors
reproduceable with fate when error pathes are forced

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovformat/subtitles: check av_copy_packets return code
Michael Niedermayer [Fri, 30 Aug 2013 18:57:04 +0000 (20:57 +0200)]
vformat/subtitles: check av_copy_packets return code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agokgv1dec: remove unused avctx from codec private context
Paul B Mahol [Fri, 30 Aug 2013 13:16:50 +0000 (13:16 +0000)]
kgv1dec: remove unused avctx from codec private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agokgv1dec: make decoder independent of sizeof(AVFrame)
Paul B Mahol [Fri, 30 Aug 2013 13:14:58 +0000 (13:14 +0000)]
kgv1dec: make decoder independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agownv1: remove unused avctx from codec private context
Paul B Mahol [Fri, 30 Aug 2013 13:31:06 +0000 (13:31 +0000)]
wnv1: remove unused avctx from codec private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/pngdec: fix last_row_size type
Michael Niedermayer [Fri, 30 Aug 2013 14:20:33 +0000 (16:20 +0200)]
avcodec/pngdec: fix last_row_size type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: Fix padded alloc code with threads
Michael Niedermayer [Fri, 30 Aug 2013 14:06:05 +0000 (16:06 +0200)]
avcodec/pngdec: Fix padded alloc code with threads

Fixes Ticket2903
Fixes out of array write
no releases should be affected by this

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoReinstate proper FFmpeg license for all files.
Thilo Borgmann [Thu, 15 Aug 2013 21:12:51 +0000 (23:12 +0200)]
Reinstate proper FFmpeg license for all files.

5 years agoFix compilation with --disable-mmx.
Carl Eugen Hoyos [Fri, 30 Aug 2013 13:21:15 +0000 (15:21 +0200)]
Fix compilation with --disable-mmx.

5 years agocmdutils: silence warning about incompatible pointer types
Paul B Mahol [Fri, 30 Aug 2013 10:39:27 +0000 (10:39 +0000)]
cmdutils: silence warning about incompatible pointer types

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/mpegvideo: reduce log level for messages about allocating frames.
Michael Niedermayer [Fri, 30 Aug 2013 12:20:59 +0000 (14:20 +0200)]
avcodec/mpegvideo: reduce log level for messages about allocating frames.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffv1dec: Check bits_per_raw_sample and colorspace for equality in ver 0/1 headers
Michael Niedermayer [Fri, 30 Aug 2013 04:08:32 +0000 (06:08 +0200)]
ffv1dec: Check bits_per_raw_sample and colorspace for equality in ver 0/1 headers

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

* qatar/master:
  ppc: don't return a value from a function declared void

See: 01a82f1dc544df7a4affb3858d12b7b2e492cbba

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e998b56362c711701b3daa34e7b956e7126336f4'
Michael Niedermayer [Fri, 30 Aug 2013 10:49:54 +0000 (12:49 +0200)]
Merge commit 'e998b56362c711701b3daa34e7b956e7126336f4'

* commit 'e998b56362c711701b3daa34e7b956e7126336f4':
  x86: avcodec: Consistently structure CPU extension initialization

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/lpc: Fix cpu flag checks so they work
Michael Niedermayer [Fri, 30 Aug 2013 10:32:54 +0000 (12:32 +0200)]
avcodec/x86/lpc: Fix cpu flag checks so they work

Broken by 6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/vp8dsp: Fix cpu flag checks so they work
Michael Niedermayer [Fri, 30 Aug 2013 10:32:54 +0000 (12:32 +0200)]
avcodec/x86/vp8dsp: Fix cpu flag checks so they work

Broken by 6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0'
Michael Niedermayer [Fri, 30 Aug 2013 10:08:28 +0000 (12:08 +0200)]
Merge commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0'

* commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0':
  x86: avcodec: Use convenience macros to check for CPU flags

Conflicts:
libavcodec/x86/dsputil_init.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/motion_est.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '79aec43ce813a3e270743ca64fa3f31fa43df80b'
Michael Niedermayer [Fri, 30 Aug 2013 09:57:29 +0000 (11:57 +0200)]
Merge commit '79aec43ce813a3e270743ca64fa3f31fa43df80b'

* commit '79aec43ce813a3e270743ca64fa3f31fa43df80b':
  x86: Add and use more convenience macros to check CPU extension availability

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoppc: don't return a value from a function declared void
Sean McGovern [Thu, 29 Aug 2013 14:39:31 +0000 (10:39 -0400)]
ppc: don't return a value from a function declared void

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoMerge commit 'a6b650118543e1580e872896d8976042b7c32d01'
Michael Niedermayer [Fri, 30 Aug 2013 09:48:50 +0000 (11:48 +0200)]
Merge commit 'a6b650118543e1580e872896d8976042b7c32d01'

* commit 'a6b650118543e1580e872896d8976042b7c32d01':
  ppc: cosmetics: Consistently format CPU flag detection invocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/encoders: reformat and add some clarification in libtwolame doc
Timothy Gu [Sat, 3 Aug 2013 23:55:40 +0000 (16:55 -0700)]
doc/encoders: reformat and add some clarification in libtwolame doc

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agodoc/encoders: reformat libmp3lame doc
Timothy Gu [Sat, 3 Aug 2013 23:51:26 +0000 (16:51 -0700)]
doc/encoders: reformat libmp3lame doc

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>