ffmpeg.git
5 years agoUpdate for 1.1.11 n1.1.11
Michael Niedermayer [Sat, 10 May 2014 20:12:32 +0000 (22:12 +0200)]
Update for 1.1.11

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agosws: dont use the optimized 410->420 unscaled conversion when height%4
Michael Niedermayer [Wed, 30 Apr 2014 04:21:58 +0000 (06:21 +0200)]
sws: dont use the optimized 410->420 unscaled conversion when height%4

Fixes Ticket3594
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 421b21ca8a02a346ba03cea3bb2ecc33f791fc30)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/graphdump: Fix pointer to local outside scope
Michael Niedermayer [Mon, 28 Apr 2014 02:01:50 +0000 (04:01 +0200)]
avfilter/graphdump: Fix pointer to local outside scope

Fixes CID1194435
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 18af0ce62da322176f7bd283b85314d2f41bee2c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: Fix undefined shift
Michael Niedermayer [Sun, 27 Apr 2014 03:32:56 +0000 (05:32 +0200)]
avcodec/mjpegdec: Fix undefined shift

Fixes CID1194388

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b4329605289e25bb071ec1c1182bf25fc83b09aa)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg_filter: fix pointer to local outside scope
Michael Niedermayer [Sun, 27 Apr 2014 01:45:12 +0000 (03:45 +0200)]
ffmpeg_filter: fix pointer to local outside scope

Fixes CID1206652
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 09b16619d33ddf93005060d0782f28a1c1cbb7f6)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswresample: fix AV_CH_LAYOUT_STEREO_DOWNMIX input
Michael Niedermayer [Wed, 23 Apr 2014 23:25:46 +0000 (01:25 +0200)]
swresample: fix AV_CH_LAYOUT_STEREO_DOWNMIX input

Fixes Ticket 3542

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 291d464161a5bf3b566bc147f83e4242b0c18d74)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/h263dec: Fix h263 probe
Michael Niedermayer [Wed, 23 Apr 2014 19:47:48 +0000 (21:47 +0200)]
avformat/h263dec: Fix h263 probe

The code was missing 1 bit in the src format

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fc145e576a443bfc89efdf35b91fd3c9ca0d8388)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mux: Check for and remove invalid packet durations
Michael Niedermayer [Wed, 23 Apr 2014 04:04:50 +0000 (06:04 +0200)]
avformat/mux: Check for and remove invalid packet durations

Fixes assertion failure
Fixes Ticket3575

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit dc6a17cf74a90e41d70ea1753cdb70c0a5b2ced8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2340ce6954db2c0a79c57fcba7f45e2fcc20cdc9' into release/1.1
Michael Niedermayer [Mon, 5 May 2014 14:21:25 +0000 (16:21 +0200)]
Merge commit '2340ce6954db2c0a79c57fcba7f45e2fcc20cdc9' into release/1.1

* commit '2340ce6954db2c0a79c57fcba7f45e2fcc20cdc9':
  update Changelog

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1f5678c5e404ebd326f6eae1b527beadaa85a528' into release/1.1
Michael Niedermayer [Sun, 4 May 2014 21:46:44 +0000 (23:46 +0200)]
Merge commit '1f5678c5e404ebd326f6eae1b527beadaa85a528' into release/1.1

* commit '1f5678c5e404ebd326f6eae1b527beadaa85a528':
  Update Changelog for v9.13

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9a2387cfb1a99e4b00593c22074929cdc73410f0' into release/1.1
Michael Niedermayer [Sun, 4 May 2014 21:46:08 +0000 (23:46 +0200)]
Merge commit '9a2387cfb1a99e4b00593c22074929cdc73410f0' into release/1.1

* commit '9a2387cfb1a99e4b00593c22074929cdc73410f0':
  swscale: Fix an undefined behaviour

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '696a74e81560889ef2fde76b045c5158a325a7a5' into release/1.1
Michael Niedermayer [Sun, 4 May 2014 21:45:24 +0000 (23:45 +0200)]
Merge commit '696a74e81560889ef2fde76b045c5158a325a7a5' into release/1.1

* commit '696a74e81560889ef2fde76b045c5158a325a7a5':
  matroska: add the Opus mapping

Conflicts:
libavformat/matroska.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mp3enc: drop redundant and uninitialized variable
Michael Niedermayer [Sun, 13 Apr 2014 18:03:24 +0000 (20:03 +0200)]
avformat/mp3enc: drop redundant and uninitialized variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit eccec203978e53f897a3c6105d011bbdff2a978b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3938b6762132d3d7ef1b5782e7dc8bf73ac8145d' into release/1.1
Michael Niedermayer [Sun, 4 May 2014 20:49:00 +0000 (22:49 +0200)]
Merge commit '3938b6762132d3d7ef1b5782e7dc8bf73ac8145d' into release/1.1

* commit '3938b6762132d3d7ef1b5782e7dc8bf73ac8145d':
  mp3enc: Properly write bitrate value in XING header

Conflicts:
libavformat/mp3enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'eb89e1b98d3676aac1287d97c633b527c1ff4ea4' into release/1.1
Michael Niedermayer [Sun, 4 May 2014 20:47:41 +0000 (22:47 +0200)]
Merge commit 'eb89e1b98d3676aac1287d97c633b527c1ff4ea4' into release/1.1

* commit 'eb89e1b98d3676aac1287d97c633b527c1ff4ea4':
  oggdec: add support for Opus in Ogg demuxing

Conflicts:
libavformat/oggparseopus.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '05de372350f8720461d3cadba40836546f1bb95c' into release/1.1
Michael Niedermayer [Sun, 4 May 2014 20:36:26 +0000 (22:36 +0200)]
Merge commit '05de372350f8720461d3cadba40836546f1bb95c' into release/1.1

* commit '05de372350f8720461d3cadba40836546f1bb95c':
  apedec: do not buffer decoded samples over AVPackets

Conflicts:
libavcodec/apedec.c

See: 77d89a5b160127b5b60ba0310cb999077a22525d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b5f92f9603c2b46c37b20134e9e2338805844f0f' into release/1.1
Michael Niedermayer [Sun, 4 May 2014 20:26:07 +0000 (22:26 +0200)]
Merge commit 'b5f92f9603c2b46c37b20134e9e2338805844f0f' into release/1.1

* commit 'b5f92f9603c2b46c37b20134e9e2338805844f0f':
  isom: lpcm in mov default to big endian

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '42a8d326978f6cf64fdc6deec8a3d91e5e1eaf07' into release/1.1
Michael Niedermayer [Sun, 4 May 2014 20:14:56 +0000 (22:14 +0200)]
Merge commit '42a8d326978f6cf64fdc6deec8a3d91e5e1eaf07' into release/1.1

* commit '42a8d326978f6cf64fdc6deec8a3d91e5e1eaf07':
  movdec: handle 0x7fff langcode as macintosh per the specs

See: e636aa1a56bcd91242c25282dcb00929196470eb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '945a1b7ab9b9df317e175e480a135a41e7e05b5c' into release/1.1
Michael Niedermayer [Sun, 4 May 2014 20:14:42 +0000 (22:14 +0200)]
Merge commit '945a1b7ab9b9df317e175e480a135a41e7e05b5c' into release/1.1

* commit '945a1b7ab9b9df317e175e480a135a41e7e05b5c':
  h264: reset next_output_pic earlier in start_frame()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cf7bb6ceb1da7682aa54989f83d81c67a5e6790d' into release/1.1
Michael Niedermayer [Sun, 4 May 2014 20:02:03 +0000 (22:02 +0200)]
Merge commit 'cf7bb6ceb1da7682aa54989f83d81c67a5e6790d' into release/1.1

* commit 'cf7bb6ceb1da7682aa54989f83d81c67a5e6790d':
  Revert "pthread: flush all threads on flush, not just the first one"

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoupdate Changelog
Rafaël Carré [Tue, 27 Aug 2013 15:35:49 +0000 (17:35 +0200)]
update Changelog

5 years agoUpdate Changelog for v9.13
Reinhard Tartler [Sun, 4 May 2014 14:37:49 +0000 (10:37 -0400)]
Update Changelog for v9.13

5 years agoswscale: Fix an undefined behaviour
Luca Barbato [Thu, 1 May 2014 22:21:23 +0000 (00:21 +0200)]
swscale: Fix an undefined behaviour

Prevent a division by zero down the codepath.

Sample-Id: 00001721-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 3a177a9cca924e097265b32f9282814f6b653e08)
(cherry picked from commit 0499f7809c1fcc33ed710cdf771a18b374702135)

5 years agomatroska: add the Opus mapping
Anton Khirnov [Sun, 27 Apr 2014 11:40:11 +0000 (13:40 +0200)]
matroska: add the Opus mapping

(cherry picked from commit 141fdc763c2841b572d29a2ad78513e8d5325870)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 79041d92ee7421853ee8c57fc13891cb0c272e0e)

5 years agomp3enc: Properly write bitrate value in XING header
Michael Niedermayer [Wed, 9 Apr 2014 16:22:53 +0000 (18:22 +0200)]
mp3enc: Properly write bitrate value in XING header

Instead of using a fixed bitrate_idx, calculate a matching bitrate for
the XING header.

Using a fixed bitrate_idx causes tools such as file(1) and mediainfo(1)
to report wrong bitrate and bitrate mode when using CBR.

Bug-Id: https://bugs.debian.org/736088

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 617a1a98a6be3e59db6fbfc21afab2fb9a049c03)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 0f6e309b97e3da83a0fa75fbf1c4b50cd72047eb)

5 years agooggdec: add support for Opus in Ogg demuxing
Nicolas George [Sun, 24 Jun 2012 09:38:18 +0000 (11:38 +0200)]
oggdec: add support for Opus in Ogg demuxing

Fixes: https://bugzilla.libav.org/show_bug.cgi?id=603
Fixes: http://bugs.debian.org/720563

(cherry picked from commit ecab1c77410f023b437c6ed3a3281be8f039e574)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
5 years agoapedec: do not buffer decoded samples over AVPackets
Rafaël Carré [Tue, 27 Aug 2013 15:35:49 +0000 (17:35 +0200)]
apedec: do not buffer decoded samples over AVPackets

Only consume an AVPacket when all the samples have been read.

When the rate of samples output is limited (by the default value
of max_samples), consuming the first packet immediately will cause
timing problems:

- The first packet with PTS 0 will output 4608 samples and be
consumed entirely
- The second packet with PTS 64 will output the remaining samples
(typically, a lot, that's why max_samples exist) until the decoded
samples of the first packet have been exhausted, at which point the
samples of the second packet will be decoded and output when
av_decode_frame is called with the next packet).

That means there's a PTS jump since the first packet is 'decoded'
immediately, which can be seen with avplay or mplayer: the timing
jumps immediately to 6.2s (which is the size of a packet).

Sample: http://streams.videolan.org/issues/6348/Goldwave-MAClib.ape

Bug-Debian: http://bugs.debian.org/744901
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
(cherry picked from commit 91d4cfb8127f1de6c4ad173a30fffe584700046d)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
5 years agoisom: lpcm in mov default to big endian
Mark Himsley [Fri, 1 Nov 2013 11:22:53 +0000 (11:22 +0000)]
isom: lpcm in mov default to big endian

It is my understanding that "Unless otherwise stated, all data in a
QuickTime movie is stored in big-endian byte ordering" [1] in MOV files.

I have a couple of thousand files, which technically are invalid because
their sound sample description element 4CC is 'lpcm' but its version is
0 - and "Version 0 supports only uncompressed audio in raw ('raw ') or
twos-complement ('twos') format" [2]

Because isom.c only contains a mapping for 4CC 'lpcm' to
AV_CODEC_ID_PCM_S16LE, these files have their audio decoded as LE when
it is actually BE.

This commit adds AV_CODEC_ID_PCM_S16BE as the first match for 4CC 'lpcm'.

[1]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 21
[2]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 178

Reviewed-by: Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>
(cherry picked from commit 360022bd3b894cc01ea112b275fa4c8f53881808)
(cherry picked from commit d37fac6dbbdddb76225aa691b83ffd9a0c7dae6b)

5 years agomovdec: handle 0x7fff langcode as macintosh per the specs
Baptiste Coudurier [Wed, 21 Mar 2012 21:18:16 +0000 (14:18 -0700)]
movdec: handle 0x7fff langcode as macintosh per the specs

The correct point that seperates ISO and MAC language codes is 0x400
according to the current QT spec. Old QT specs did not list where this
seperation is but apparently only defined the meaning of the first 137.

(cherry picked from commit 9e71cc81f3655cacf0f91860fba3043f13b64059)
(cherry picked from commit 7940306a47df602be4f57a62175706265bbfd0aa)

5 years agoh264: reset next_output_pic earlier in start_frame()
Anton Khirnov [Wed, 23 Apr 2014 20:26:40 +0000 (22:26 +0200)]
h264: reset next_output_pic earlier in start_frame()

In case start_frame() fails, this potentially invalid frame can still be
output to the caller.

Bug-Id: 672
Bug-Id: debian/741240
Bug-Id: ubuntu/1288206

5 years agoRevert "pthread: flush all threads on flush, not just the first one"
Anton Khirnov [Thu, 24 Apr 2014 05:40:34 +0000 (07:40 +0200)]
Revert "pthread: flush all threads on flush, not just the first one"

This reverts commit 2eb15cdeef29eb8a0a32658154decba94b4b89cb.

It does not work correctly in pre-refcounting threading code.

5 years agoUpdate for FFmpeg 1.1.10 n1.1.10
Michael Niedermayer [Mon, 21 Apr 2014 23:01:20 +0000 (01:01 +0200)]
Update for FFmpeg 1.1.10

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/filtfmts: Support dynamically allocated in/outputs
Michael Niedermayer [Mon, 21 Apr 2014 09:33:17 +0000 (11:33 +0200)]
avfilter/filtfmts: Support dynamically allocated in/outputs

Fixes crash
Fixes Ticket3468

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 59c7615d58b5b7ea9caff2c8c774677973eb4f1c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_deshake: fix loss of precission with odd resolutions
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avfilter/vf_deshake: fix loss of precission with odd resolutions

Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 73734282e0e4df92269984ee1671424e39249481)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/g723_1: add assert to help static code analyzers
Michael Niedermayer [Wed, 16 Apr 2014 00:55:13 +0000 (02:55 +0200)]
avcodec/g723_1: add assert to help static code analyzers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1457f3fd90e17745791354fbb87899fc4803085a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/diracdec: fix undefined behavior with shifts
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avcodec/diracdec: fix undefined behavior with shifts

Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b8598f6ce61ccda3f2ff0c730b009fb650e42986)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegts: Remove redundant check
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avformat/mpegts: Remove redundant check

Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ff6fa0b4b980fc5b9f7653d7b159ae02c3d95210)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/swscale: fix srcStride/srcSlice typo
Michael Niedermayer [Tue, 15 Apr 2014 23:55:08 +0000 (01:55 +0200)]
swscale/swscale: fix srcStride/srcSlice typo

Fixes part of Ticket3466
Found by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 14fa7fc6a81d5e59e05243cdc92108eab1b138ac)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/idct_sse2_xvid: fix non C99 inline function
Michael Niedermayer [Mon, 14 Apr 2014 15:29:27 +0000 (17:29 +0200)]
avcodec/x86/idct_sse2_xvid: fix non C99 inline function

Found-by: Matt Oliver <protogonoi@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 46d5625f44185271862337d61cd246fd569c42a4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dirac_arith: Fix build with PIC and stack-check options
Anthoine Bourgeois [Wed, 9 Apr 2014 10:18:32 +0000 (12:18 +0200)]
avcodec/dirac_arith: Fix build with PIC and stack-check options

Fixes Ticket3540

The function dirac_get_arith_bit in libavcodec/dirac_arith.h can't be
built with PIC and check-stack because the asm code needs 6 registers
and PIC and check-stack options take 1 each and x86 is quite limited
in this area.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d8ab7f31dd819f7b3e0d460a2fa4261aaae87b98)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/x86/swscale_template: loose hardcoded dstw_offset
Michael Niedermayer [Tue, 8 Apr 2014 16:12:12 +0000 (18:12 +0200)]
swscale/x86/swscale_template: loose hardcoded dstw_offset

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f6759d9ad4a8b71e6f212ca4f1e7da9fa56d3298)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswresample/resample: use av_malloc_array() where appropriate
Michael Niedermayer [Mon, 7 Apr 2014 22:29:26 +0000 (00:29 +0200)]
swresample/resample: use av_malloc_array() where appropriate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5027f39712fdce25b9008e72d52e5abfeefd5fe6)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswresample/dither: use av_malloc_array()
Michael Niedermayer [Mon, 7 Apr 2014 22:29:06 +0000 (00:29 +0200)]
swresample/dither: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a5290cb1ac047851563da7aca06569e3ada55f79)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswresample/resample: Limit filter length
Michael Niedermayer [Mon, 7 Apr 2014 22:19:07 +0000 (00:19 +0200)]
swresample/resample: Limit filter length

Related to CID1197063

The limit choosen is arbitrary and much larger than what makes sense.
It avoids the need for checking arithmetic operations with the length for overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f9158b01d0f3effb58e87fb07db0382bc1e47de5)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/wma: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Sat, 5 Apr 2014 19:34:03 +0000 (21:34 +0200)]
avcodec/wma: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d167faafe9dfa0b82bebb267c3c4e5fa5286bd67)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavu/opt: validate range before dereference
Lukasz Marek [Fri, 4 Apr 2014 17:28:45 +0000 (19:28 +0200)]
lavu/opt: validate range before dereference

This change make error handling simplier.
av_opt_freep_ranges may be called when some ranges are NULL,
for example after memory allocation fail.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3aac5fcfa9d3748659d78ab2a66d0ccce22cfd4f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264_mp4toannexb_bsf: prepend global headers before any in stream parameter...
Michael Niedermayer [Wed, 26 Mar 2014 17:09:23 +0000 (18:09 +0100)]
avcodec/h264_mp4toannexb_bsf: prepend global headers before any in stream parameter sets

Fixes h264_mp4toannexb_bsf_failure.mkv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 289b149cecb381522cc9ccdf382825330169c655)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/mpegvideoenc_template: fix integer overflow
Michael Niedermayer [Mon, 24 Mar 2014 23:15:52 +0000 (00:15 +0100)]
avcodec/x86/mpegvideoenc_template: fix integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h263dec: Fix use of uninitialized memory from the bitstream buffer
Michael Niedermayer [Tue, 18 Mar 2014 17:06:17 +0000 (18:06 +0100)]
avcodec/h263dec: Fix use of uninitialized memory from the bitstream buffer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f07cebcd910c97ff6012085c21493231752990e9)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/x86/swscale: fix missing xmm clobbers in yuv2yuvX_sse3()
Michael Niedermayer [Sat, 15 Mar 2014 21:52:22 +0000 (22:52 +0100)]
swscale/x86/swscale: fix missing xmm clobbers in yuv2yuvX_sse3()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6c47a4e972485e5f0c812159373f703c6f1d089f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: use pkg-config to detect libbluray
Timothy Gu [Mon, 24 Feb 2014 00:39:18 +0000 (16:39 -0800)]
configure: use pkg-config to detect libbluray

The current configure fails when static libbluray is compiled with libxml2
support.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit baa650cc7946a9eb1cf5a083f61a581a97122f03)
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Conflicts:
configure

5 years agoMerge commit 'ce364088ef53dbaf90e74a471d12b732b697e0cd' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 15:24:19 +0000 (17:24 +0200)]
Merge commit 'ce364088ef53dbaf90e74a471d12b732b697e0cd' into release/1.1

* commit 'ce364088ef53dbaf90e74a471d12b732b697e0cd':
  configure: Support older version of openjpeg1

Conflicts:
configure

See: 58b8d268d97109b3df0fd77feb7acde3f139c4e1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ca14a2d0e40720d018421e06995737e5682c33c9' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 15:23:39 +0000 (17:23 +0200)]
Merge commit 'ca14a2d0e40720d018421e06995737e5682c33c9' into release/1.1

* commit 'ca14a2d0e40720d018421e06995737e5682c33c9':
  configure: Use the right pkgconf file for openjpeg

Conflicts:
configure

See: 182c674f68139f5613147fd9e0a7f196dc9c8bea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b77819afbc44016143b4a11b46109625203c4cef' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 15:14:12 +0000 (17:14 +0200)]
Merge commit 'b77819afbc44016143b4a11b46109625203c4cef' into release/1.1

* commit 'b77819afbc44016143b4a11b46109625203c4cef':
  rtmpproto: Make sure to pass on the error code if read_connect failed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'dccac759d39e761398d3d4172ae0b98c0186efa5' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 15:13:55 +0000 (17:13 +0200)]
Merge commit 'dccac759d39e761398d3d4172ae0b98c0186efa5' into release/1.1

* commit 'dccac759d39e761398d3d4172ae0b98c0186efa5':
  lavr: allocate the resampling buffer with a positive size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '85b8b169175a55fc862e01ecc96f649374bc14d2' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 15:06:03 +0000 (17:06 +0200)]
Merge commit '85b8b169175a55fc862e01ecc96f649374bc14d2' into release/1.1

* commit '85b8b169175a55fc862e01ecc96f649374bc14d2':
  tiffdec: use bytestream2 to simplify overread/overwrite protection

Conflicts:
libavcodec/tiff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd946e4c1bcfb6accd97f6d4cbfa324ef01913c8d' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 14:56:56 +0000 (16:56 +0200)]
Merge commit 'd946e4c1bcfb6accd97f6d4cbfa324ef01913c8d' into release/1.1

* commit 'd946e4c1bcfb6accd97f6d4cbfa324ef01913c8d':
  bytestream: add bytestream2_copy_buffer() functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0c5e6c542f5efffb4cd770e84967478b0076a6e5' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 14:56:36 +0000 (16:56 +0200)]
Merge commit '0c5e6c542f5efffb4cd770e84967478b0076a6e5' into release/1.1

* commit '0c5e6c542f5efffb4cd770e84967478b0076a6e5':
  bytestream: add functions for accessing size of buffer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd21bf0d27b547adcaabaa28d475e6b9f97dfe20a' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 14:56:14 +0000 (16:56 +0200)]
Merge commit 'd21bf0d27b547adcaabaa28d475e6b9f97dfe20a' into release/1.1

* commit 'd21bf0d27b547adcaabaa28d475e6b9f97dfe20a':
  resample: fix avresample_get_delay() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '03562c44c0c1e59d2a598390c5b2181ac406611c' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 14:50:32 +0000 (16:50 +0200)]
Merge commit '03562c44c0c1e59d2a598390c5b2181ac406611c' into release/1.1

* commit '03562c44c0c1e59d2a598390c5b2181ac406611c':
  avi: Improve non-interleaved detection

Conflicts:
libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ee21d270f8dc5fdb2263f5dd87407aae9fe1ecd1' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 14:42:19 +0000 (16:42 +0200)]
Merge commit 'ee21d270f8dc5fdb2263f5dd87407aae9fe1ecd1' into release/1.1

* commit 'ee21d270f8dc5fdb2263f5dd87407aae9fe1ecd1':
  af_channelmap: fix ONE_STR mapping mode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9f7119b7fe003e94d72e81f3aa922568c2827dce' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 14:34:58 +0000 (16:34 +0200)]
Merge commit '9f7119b7fe003e94d72e81f3aa922568c2827dce' into release/1.1

* commit '9f7119b7fe003e94d72e81f3aa922568c2827dce':
  movenc: allow override of "writing application" tag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd375d6395c0a5203932d89c087f77a5757a08138' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 14:34:29 +0000 (16:34 +0200)]
Merge commit 'd375d6395c0a5203932d89c087f77a5757a08138' into release/1.1

* commit 'd375d6395c0a5203932d89c087f77a5757a08138':
  matroskaenc: allow override of "writing application" tag

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b1432e905d462198a8d7834b256848f2b9e4f8e6' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 14:32:39 +0000 (16:32 +0200)]
Merge commit 'b1432e905d462198a8d7834b256848f2b9e4f8e6' into release/1.1

* commit 'b1432e905d462198a8d7834b256848f2b9e4f8e6':
  avfilter: Add missing emms_c when needed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1bccf68caeee787139f22679e1300a5eea048cf5' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 14:26:32 +0000 (16:26 +0200)]
Merge commit '1bccf68caeee787139f22679e1300a5eea048cf5' into release/1.1

* commit '1bccf68caeee787139f22679e1300a5eea048cf5':
  build: Use pkg-config for openjpeg

Conflicts:
configure

See: 9c99bc1f3fb974f07bc9b565dad00d0e162a09c1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2eb15cdeef29eb8a0a32658154decba94b4b89cb' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 14:25:21 +0000 (16:25 +0200)]
Merge commit '2eb15cdeef29eb8a0a32658154decba94b4b89cb' into release/1.1

* commit '2eb15cdeef29eb8a0a32658154decba94b4b89cb':
  pthread: flush all threads on flush, not just the first one

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b701e26a4e89e3816490bc74bc47f82e6b7f7002' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 14:18:20 +0000 (16:18 +0200)]
Merge commit 'b701e26a4e89e3816490bc74bc47f82e6b7f7002' into release/1.1

* commit 'b701e26a4e89e3816490bc74bc47f82e6b7f7002':
  mpeg12: check scantable indices in all decode_block functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ea1806ce650f0502dd25939c335b9216fa4a955f' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 14:00:51 +0000 (16:00 +0200)]
Merge commit 'ea1806ce650f0502dd25939c335b9216fa4a955f' into release/1.1

* commit 'ea1806ce650f0502dd25939c335b9216fa4a955f':
  sgidec: fix buffer size check in expand_rle_row()

Conflicts:
libavcodec/sgidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ff409c7d80b6781e4b81dd860badb569061ddaa5' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 13:55:28 +0000 (15:55 +0200)]
Merge commit 'ff409c7d80b6781e4b81dd860badb569061ddaa5' into release/1.1

* commit 'ff409c7d80b6781e4b81dd860badb569061ddaa5':
  adx: check that the offset is not negative

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c9be276f8b040e7d441a77f774afe94b6f137be6' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 13:54:30 +0000 (15:54 +0200)]
Merge commit 'c9be276f8b040e7d441a77f774afe94b6f137be6' into release/1.1

* commit 'c9be276f8b040e7d441a77f774afe94b6f137be6':
  mpegvideo: set reference/pict_type on generated reference frames

Conflicts:
libavcodec/mpegvideo.c

See: 532b93b51631ee58443bee8aec7c2a2b2a1746be
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd8e89a37267f276afd404bd062e5112a336d1a36' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 13:33:23 +0000 (15:33 +0200)]
Merge commit 'd8e89a37267f276afd404bd062e5112a336d1a36' into release/1.1

* commit 'd8e89a37267f276afd404bd062e5112a336d1a36':
  h264: reset data partitioning at the beginning of each decode call

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7e8d27c8510a024e6d66d2e1116bb8692d9cb98a' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 13:29:29 +0000 (15:29 +0200)]
Merge commit '7e8d27c8510a024e6d66d2e1116bb8692d9cb98a' into release/1.1

* commit '7e8d27c8510a024e6d66d2e1116bb8692d9cb98a':
  h264: reset ref count if decoding the slice header fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7fd6c9fb49573870b48a995947edc83eedd7e86e' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 13:28:24 +0000 (15:28 +0200)]
Merge commit '7fd6c9fb49573870b48a995947edc83eedd7e86e' into release/1.1

* commit '7fd6c9fb49573870b48a995947edc83eedd7e86e':
  h264: reset first_field if frame_start() fails for missing refs

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '175b53d051cf9e17583106c828c35d169f335ea3' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 13:18:35 +0000 (15:18 +0200)]
Merge commit '175b53d051cf9e17583106c828c35d169f335ea3' into release/1.1

* commit '175b53d051cf9e17583106c828c35d169f335ea3':
  h264: limit allowed pred modes in ff_h264_check_intra_pred_mode() to 3

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264: fix size of arrays in ff_h264_check_intra_pred_mode()
Michael Niedermayer [Fri, 21 Jun 2013 17:39:45 +0000 (19:39 +0200)]
h264: fix size of arrays in ff_h264_check_intra_pred_mode()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d6a33f5d20b6ef2eae2cbb959b001cb125a564b7)

Conflicts:

libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264/ff_h264_check_intra_pred_mode: fix input value check
Michael Niedermayer [Fri, 21 Jun 2013 17:51:30 +0000 (19:51 +0200)]
h264/ff_h264_check_intra_pred_mode: fix input value check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2005fddcbb4e18e8f7c34326e40609e4a2d83c31)

Conflicts:

libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7f604a048e9b6128cdf9ce7e95f21d1a9822ba39' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 13:15:19 +0000 (15:15 +0200)]
Merge commit '7f604a048e9b6128cdf9ce7e95f21d1a9822ba39' into release/1.1

* commit '7f604a048e9b6128cdf9ce7e95f21d1a9822ba39':
  h264: reject mismatching luma/chroma bit depths during sps parsing

Conflicts:
libavcodec/h264_ps.c

See: bdeb61ccc67911cfc5e20c7cfb1312d0501ca90a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7e513d85e80d730718695d09fcaf0295ae24699e' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 13:02:33 +0000 (15:02 +0200)]
Merge commit '7e513d85e80d730718695d09fcaf0295ae24699e' into release/1.1

* commit '7e513d85e80d730718695d09fcaf0295ae24699e':
  h264: check that execute_decode_slices() is not called too many times

See: 64591f8f86f2dfeac13ee6b4e971d069675ca814
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b6a0f5cde808d84626f07b11c381cc6ef0954940' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 13:01:26 +0000 (15:01 +0200)]
Merge commit 'b6a0f5cde808d84626f07b11c381cc6ef0954940' into release/1.1

* commit 'b6a0f5cde808d84626f07b11c381cc6ef0954940':
  h264: do not use 422 functions for monochrome

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1147d39bca135df8673031d16989ba486a52172a' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 12:45:04 +0000 (14:45 +0200)]
Merge commit '1147d39bca135df8673031d16989ba486a52172a' into release/1.1

* commit '1147d39bca135df8673031d16989ba486a52172a':
  h264: reset data_partitioning if decoding the slice header for NAL_DPA fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '30e58e65e543d04d5e52bf188b31abf4dd41a104' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 12:39:42 +0000 (14:39 +0200)]
Merge commit '30e58e65e543d04d5e52bf188b31abf4dd41a104' into release/1.1

* commit '30e58e65e543d04d5e52bf188b31abf4dd41a104':
  h264_refs: make sure not to write over the bounds of the default ref list

Conflicts:
libavcodec/h264_refs.c

See: 0a5ca63c24b8a07f94611637ba29e41b8b47ce24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'af40847681b978441fdd25276685414f9e17820a' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 12:34:02 +0000 (14:34 +0200)]
Merge commit 'af40847681b978441fdd25276685414f9e17820a' into release/1.1

* commit 'af40847681b978441fdd25276685414f9e17820a':
  h264: check buffer size before accessing it

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fc53a09909ae046dbe4d339bffc744cfc328253e' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 12:25:01 +0000 (14:25 +0200)]
Merge commit 'fc53a09909ae046dbe4d339bffc744cfc328253e' into release/1.1

* commit 'fc53a09909ae046dbe4d339bffc744cfc328253e':
  cmdutils: update copyright year to 2014.

Conflicts:
cmdutils.c

No change as the copyright year has already been fixed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4c1e4bc6af1596995e895cd7da9f3b436051114c' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 12:24:15 +0000 (14:24 +0200)]
Merge commit '4c1e4bc6af1596995e895cd7da9f3b436051114c' into release/1.1

* commit '4c1e4bc6af1596995e895cd7da9f3b436051114c':
  Prepare for 9.13 Release

Conflicts:
RELEASE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd791e8c990a752435d993df01516ebe469d94535' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 12:20:35 +0000 (14:20 +0200)]
Merge commit 'd791e8c990a752435d993df01516ebe469d94535' into release/1.1

* commit 'd791e8c990a752435d993df01516ebe469d94535':
  doc: Point to the correct, actually maintained gas-preprocessor repo

Conflicts:
doc/platform.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f1a2364cebe472a98a5ea157071f4eee4429ce9f' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 12:19:35 +0000 (14:19 +0200)]
Merge commit 'f1a2364cebe472a98a5ea157071f4eee4429ce9f' into release/1.1

* commit 'f1a2364cebe472a98a5ea157071f4eee4429ce9f':
  Update Changelog for 9.12

Conflicts:
Changelog

Not merged, as the changelog does not apply to FFmpeg like this

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b00444c0bbbc78ae477ec697d6569893609f420d' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 12:06:52 +0000 (14:06 +0200)]
Merge commit 'b00444c0bbbc78ae477ec697d6569893609f420d' into release/1.1

* commit 'b00444c0bbbc78ae477ec697d6569893609f420d':
  configure: Update freetype check to follow upstream

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: Special case libfreetype test
Alexander Strasser [Fri, 6 Dec 2013 16:20:26 +0000 (17:20 +0100)]
configure: Special case libfreetype test

Include the freetype header, in-directly through a macro, like it
is done in the drawtext filter. Do not break if the header is moved.

Unfortunately the drawtext filter included the file where the include
macros are defined in a wrong way. This is not needed and breaks the
build. Remove that #include line too.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
(cherry picked from commit cea5812fa723c08b89d929eeba73462e05de2973)

Conflicts:

configure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '29b3ca743dd02efbe00565c0b997e735e4daa772' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 12:02:06 +0000 (14:02 +0200)]
Merge commit '29b3ca743dd02efbe00565c0b997e735e4daa772' into release/1.1

* commit '29b3ca743dd02efbe00565c0b997e735e4daa772':
  drawtext: Drop pointless header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a32e45df82751784f9461f01310e63f4bed721dc' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 11:56:06 +0000 (13:56 +0200)]
Merge commit 'a32e45df82751784f9461f01310e63f4bed721dc' into release/1.1

* commit 'a32e45df82751784f9461f01310e63f4bed721dc':
  configure: Support preprocessor macros as header names

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7a2254ab26b24255a4d6ea476ba5fd38525a9bb3' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 11:55:34 +0000 (13:55 +0200)]
Merge commit '7a2254ab26b24255a4d6ea476ba5fd38525a9bb3' into release/1.1

* commit '7a2254ab26b24255a4d6ea476ba5fd38525a9bb3':
  arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cb95c1935f43ee6ae7fd15439df0f674e809f180' into release/1.1
Michael Niedermayer [Mon, 21 Apr 2014 11:32:22 +0000 (13:32 +0200)]
Merge commit 'cb95c1935f43ee6ae7fd15439df0f674e809f180' into release/1.1

* commit 'cb95c1935f43ee6ae7fd15439df0f674e809f180':
  qt-faststart: Check offset_count before reading from the moov_atom buffer

Conflicts:
tools/qt-faststart.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: Support older version of openjpeg1
Luca Barbato [Wed, 12 Mar 2014 09:30:07 +0000 (09:30 +0000)]
configure: Support older version of openjpeg1

It should work best for debian stable and people not installing the .pc
file.
(cherry picked from commit aa807425395caa17a85ed2833133278e8bd44a76)

Conflicts:
configure

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoconfigure: Use the right pkgconf file for openjpeg
Luca Barbato [Mon, 10 Mar 2014 10:48:04 +0000 (11:48 +0100)]
configure: Use the right pkgconf file for openjpeg

The current release of version 1 uses libopenjpeg1.
(cherry picked from commit 4a8562394b685e83ae4a38a93eef43625755a231)

Conflicts:
configure

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agortmpproto: Make sure to pass on the error code if read_connect failed
Martin Storsjö [Sun, 13 Apr 2014 10:44:03 +0000 (13:44 +0300)]
rtmpproto: Make sure to pass on the error code if read_connect failed

Previously, if read_connect failed, the ret variable was unmodified
and had the value 0, indicating success, which then was returned from
the rtmp_open function, even though it actually failed.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 6477139721f559b26eafd415e23e13ea2b0c27e1)

5 years agolavr: allocate the resampling buffer with a positive size
Anton Khirnov [Thu, 20 Mar 2014 19:40:24 +0000 (20:40 +0100)]
lavr: allocate the resampling buffer with a positive size

This fixes cases where very few input samples (fewer than needed for one
output sample) are passed to lavr at the beginning.
CC:libav-stable@libav.org
(cherry picked from commit ac976ed91e323754e9a84509873ebdb437372797)

5 years agotiffdec: use bytestream2 to simplify overread/overwrite protection
Justin Ruggles [Sun, 29 Sep 2013 23:47:55 +0000 (19:47 -0400)]
tiffdec: use bytestream2 to simplify overread/overwrite protection

Based on a patch by Paul B Mahol <onemda@gmail.com>

CC:libav-stable@libav.org

5 years agobytestream: add bytestream2_copy_buffer() functions
Justin Ruggles [Sun, 29 Sep 2013 23:45:57 +0000 (19:45 -0400)]
bytestream: add bytestream2_copy_buffer() functions

This is basically an overread/overwrite-safe memcpy between a
GetByteContext and a PutByteContext.

CC:libav-stable@libav.org
(cherry picked from commit 5748faf291fec297ef25d81962b52b3438f54278)

5 years agobytestream: add functions for accessing size of buffer
Paul B Mahol [Wed, 21 Mar 2012 00:10:18 +0000 (00:10 +0000)]
bytestream: add functions for accessing size of buffer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
CC:libav-stable@libav.org
(cherry picked from commit de9d2705f61ef569487ec5f8974a9c7ce34ec783)

5 years agoresample: fix avresample_get_delay() return value
Anton Khirnov [Tue, 4 Mar 2014 20:18:27 +0000 (21:18 +0100)]
resample: fix avresample_get_delay() return value

The correct "next" input sample is not the first sample of the
resampling buffer, but the center sample of the filter_length-sized
block at the beginning.

CC:libav-stable@libav.org