ffmpeg.git
4 years agoMerge commit '2d1309c3528f89bfafe1298badf39fe7a1be0542' into release/2.4
Michael Niedermayer [Sat, 28 Feb 2015 18:05:48 +0000 (19:05 +0100)]
Merge commit '2d1309c3528f89bfafe1298badf39fe7a1be0542' into release/2.4

* commit '2d1309c3528f89bfafe1298badf39fe7a1be0542':
  hevc_deblock: Fix compilation with nasm

See: c75fdee747179e21e3cc137b2565ba911b17f9c5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '2686dab45eec54f99866413153aa0b36381e48be' into release/2.4
Michael Niedermayer [Sat, 28 Feb 2015 18:05:14 +0000 (19:05 +0100)]
Merge commit '2686dab45eec54f99866413153aa0b36381e48be' into release/2.4

* commit '2686dab45eec54f99866413153aa0b36381e48be':
  h264: initialize H264Context.avctx in init_thread_copy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '06d433366c02ab81a1aaad33d32934b4180d354b' into release/2.4
Michael Niedermayer [Sat, 28 Feb 2015 18:04:29 +0000 (19:04 +0100)]
Merge commit '06d433366c02ab81a1aaad33d32934b4180d354b' into release/2.4

* commit '06d433366c02ab81a1aaad33d32934b4180d354b':
  h264: Do not share rbsp_buffer across threads

Conflicts:
libavcodec/h264.c

See: ecbf838c7d81ebd3b89fe75d83ff29150dbda27a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '1dbfaa34e615606cb3f1a3ecabb117e354459edc' into release/2.4
Michael Niedermayer [Sat, 28 Feb 2015 18:03:35 +0000 (19:03 +0100)]
Merge commit '1dbfaa34e615606cb3f1a3ecabb117e354459edc' into release/2.4

* commit '1dbfaa34e615606cb3f1a3ecabb117e354459edc':
  h264: only ref cur_pic in update_thread_context if it is initialized

Conflicts:
libavcodec/h264_slice.c

See: 0fc01ae33c7712168aab0f98c5715b40da0b5f03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohevc_deblock: Fix compilation with nasm
Carl Eugen Hoyos [Sun, 22 Feb 2015 17:46:49 +0000 (17:46 +0000)]
hevc_deblock: Fix compilation with nasm

CC: libav-stable@libav.org
Bug-Id: 795
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoh264: initialize H264Context.avctx in init_thread_copy
Anton Khirnov [Thu, 12 Feb 2015 12:06:49 +0000 (13:06 +0100)]
h264: initialize H264Context.avctx in init_thread_copy

This prevents using a wrong (first thread's) AVCodecContext if decoding
a frame in the first pass over all threads fails.

(cherry picked from commit a06b0b1295c51d100101e0ca0434e199ad6de6b5)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoh264: Do not share rbsp_buffer across threads
Michael Niedermayer [Sun, 25 Aug 2013 01:01:19 +0000 (03:01 +0200)]
h264: Do not share rbsp_buffer across threads

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
CC: libav-stable@libav.org
(cherry picked from commit 61928b68dc28e080b8c8191afe5541123c682bbd)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoh264: only ref cur_pic in update_thread_context if it is initialized
Anton Khirnov [Thu, 12 Feb 2015 11:26:58 +0000 (12:26 +0100)]
h264: only ref cur_pic in update_thread_context if it is initialized

It may be empty if the previous thread's decode call did not contain a
valid frame.

(cherry picked from commit 0dea4c77ccf5956561bb8991311b3d834bb5fa40)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoavcodec/gif: fix off by one in column offsetting finding
Clément Bœsch [Mon, 16 Feb 2015 16:23:34 +0000 (17:23 +0100)]
avcodec/gif: fix off by one in column offsetting finding

(cherry picked from commit f9240ec01abb097263fe578d2b6fb076bb7b9263)

4 years agoavutil/opencl: don't include config.h n2.4.7
James Almer [Mon, 12 Jan 2015 16:48:52 +0000 (13:48 -0300)]
avutil/opencl: don't include config.h

It's not an installed header.

Tested-by: Thilo Borgmann <thilo.borgmann@mail.de>
Tested-by: Wei Gao <highgod0401@gmail.com>
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 3aaff803489af21011b8cf03847e17b29643c922)

4 years agox86/swr: add missing alignment check to pack_6ch functions
James Almer [Wed, 31 Dec 2014 05:15:08 +0000 (02:15 -0300)]
x86/swr: add missing alignment check to pack_6ch functions

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 5f14f9e9849579b3418aebfde8a162d9c172d0ea)

4 years agoUpdate for 2.4.7
Michael Niedermayer [Fri, 13 Feb 2015 20:18:42 +0000 (21:18 +0100)]
Update for 2.4.7

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/flac_parser: fix handling EOF if no headers are found
Michael Niedermayer [Sat, 17 Jan 2015 00:56:03 +0000 (01:56 +0100)]
avcodec/flac_parser: fix handling EOF if no headers are found

Fixes assertion failure
Fixes Ticket4269

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_framepack: Check and update frame_rate
Michael Niedermayer [Fri, 16 Jan 2015 20:36:26 +0000 (21:36 +0100)]
avfilter/vf_framepack: Check and update frame_rate

The frame_rate update was missing leaving the output frame rate
wrong.

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavdevice: Use av_format_get_control_message_cb()
Michael Niedermayer [Fri, 16 Jan 2015 01:10:35 +0000 (02:10 +0100)]
avdevice: Use av_format_get_control_message_cb()

This is required as the location of this field could change and is
specified in libavformat not avdevice

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/hevc: Fix handling of skipped_bytes() reallocation failures
Michael Niedermayer [Tue, 13 Jan 2015 17:51:33 +0000 (18:51 +0100)]
avcodec/hevc: Fix handling of skipped_bytes() reallocation failures

Fixes CID1260704

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoqpeg: avoid pointless invalid memcpy()
wm4 [Tue, 13 Jan 2015 13:47:47 +0000 (14:47 +0100)]
qpeg: avoid pointless invalid memcpy()

If refdata was NULL, the memcpy() ended up copying the same memory
block onto itself, which is not only pointless, but also undefined
behavior.

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/arm/videodsp_armv5te: Fix linking failure with "g++ -shared -D__STDC_CONSTANT...
Michael Niedermayer [Thu, 12 Feb 2015 15:35:29 +0000 (16:35 +0100)]
avcodec/arm/videodsp_armv5te: Fix linking failure with "g++ -shared -D__STDC_CONSTANT_MACROS -o test.so ... libavcodec.a"

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mjpegdec: Skip blocks which are outside the visible area
Michael Niedermayer [Wed, 11 Feb 2015 02:33:53 +0000 (03:33 +0100)]
avcodec/mjpegdec: Skip blocks which are outside the visible area

Fixes out of array accesses
Fixes: ffmpeg_mjpeg_crash.avi

Found-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 08509c8f86626815a3e9e68d600d1aacbb8df4bf)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavc/aarch64: Do not use the neon horizontal chroma loop filter for H.264 4:2:2.
Carl Eugen Hoyos [Sat, 31 Jan 2015 09:01:37 +0000 (10:01 +0100)]
lavc/aarch64: Do not use the neon horizontal chroma loop filter for H.264 4:2:2.
(cherry picked from commit 4faea46bd906b3897018736208123aa36c3f45d5)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_slice: assert that reinit does not occur after the first slice
Michael Niedermayer [Sat, 7 Feb 2015 02:45:14 +0000 (03:45 +0100)]
avcodec/h264_slice: assert that reinit does not occur after the first slice

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_slice: ignore SAR changes in slices after the first
Michael Niedermayer [Sat, 7 Feb 2015 02:34:48 +0000 (03:34 +0100)]
avcodec/h264_slice: ignore SAR changes in slices after the first

Fixes race condition and null pointer dereference
Fixes: signal_sigsegv_1472ac3_468_cov_2915641226_CABACI3_Sony_B.jsv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 38d5241b7f36c1571a88517a0650caade16dd5f4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_slice: Check picture structure before setting the related fields
Michael Niedermayer [Sat, 7 Feb 2015 01:22:44 +0000 (02:22 +0100)]
avcodec/h264_slice: Check picture structure before setting the related fields

This might fix a hypothetical race condition

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_slice: Do not change frame_num after the first slice
Michael Niedermayer [Sat, 7 Feb 2015 01:06:20 +0000 (02:06 +0100)]
avcodec/h264_slice: Do not change frame_num after the first slice

Fixes potential race condition
Fixes: signal_sigsegv_1472ac3_468_cov_2915641226_CABACI3_Sony_B.jsv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f906982c9411f3062e3ce68013309b37c213c4dd)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/opt: Fix type used to access AV_OPT_TYPE_SAMPLE_FMT
Michael Niedermayer [Fri, 6 Feb 2015 21:16:08 +0000 (22:16 +0100)]
avutil/opt: Fix type used to access AV_OPT_TYPE_SAMPLE_FMT

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/opt: Fix types used to access AV_OPT_TYPE_PIXEL_FMT
Michael Niedermayer [Fri, 6 Feb 2015 21:14:15 +0000 (22:14 +0100)]
avutil/opt: Fix types used to access AV_OPT_TYPE_PIXEL_FMT

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264: Be more strict on rejecting pps/sps changes
Michael Niedermayer [Fri, 6 Feb 2015 14:09:54 +0000 (15:09 +0100)]
avcodec/h264: Be more strict on rejecting pps/sps changes

Fixes race condition
Fixes: signal_sigsegv_1472ac3_468_cov_2915641226_CABACI3_Sony_B.jsv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6fafc62b0bd0e206deb77a7aabbf3a370ad80789)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264: Be more strict on rejecting pps_id changes
Michael Niedermayer [Fri, 6 Feb 2015 14:01:17 +0000 (15:01 +0100)]
avcodec/h264: Be more strict on rejecting pps_id changes

Fixes race condition
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 31cc9c04ca386dce289864021982da62190982ab)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_ps: More completely check the bit depths
Michael Niedermayer [Fri, 6 Feb 2015 03:11:56 +0000 (04:11 +0100)]
avcodec/h264_ps: More completely check the bit depths

Fixes out of array read
Fixes: asan_static-oob_30328b6_719_cov_3325483287_H264_artifacts_motion.h264

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 69aa79365c1e8e1cb597d33e77bf1062c2ef47d4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/thp: Check av_get_packet() for failure not only for partial output
Michael Niedermayer [Thu, 5 Feb 2015 02:45:21 +0000 (03:45 +0100)]
avformat/thp: Check av_get_packet() for failure not only for partial output

Fixes null pointer dereference
Fixes: signal_sigsegv_db2c1f_3108_cov_163322880_pikmin2_opening1_partial.thp

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f2579dbb4b31e6ae731e7f5555680528ef3020ab)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale/utils: Limit filter shifting so as not to read from prior the array
Michael Niedermayer [Wed, 4 Feb 2015 23:12:08 +0000 (00:12 +0100)]
swscale/utils: Limit filter shifting so as not to read from prior the array

Fixes out of array read
Fixes: asan_heap-oob_1fb2f9b_3780_cov_3984375136_usf.mkv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 692b22626ec9a9585f667c124a186b1a9796e432)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo_motion: Fix gmc chroma dimensions
Michael Niedermayer [Wed, 4 Feb 2015 21:30:08 +0000 (22:30 +0100)]
avcodec/mpegvideo_motion: Fix gmc chroma dimensions

Fixes integer overflow and out of array read
Fixes: asan_heap-oob_1fb2f9b_3780_cov_3984375136_usf.mkv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fd52d2d3d1ee41822a9801dffd41c0e1a2db32a8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mjpegdec: Check number of components for JPEG-LS
Michael Niedermayer [Wed, 4 Feb 2015 19:48:30 +0000 (20:48 +0100)]
avcodec/mjpegdec: Check number of components for JPEG-LS

Fixes out of array accesses
Fixes: asan_heap-oob_1c1a4ea_1242_cov_2274415971_TESTcmyk.jpg

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fabbfaa095660982cc0bc63242c459561fa37037)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mjpegdec: Check escape sequence validity
Michael Niedermayer [Wed, 4 Feb 2015 19:13:18 +0000 (20:13 +0100)]
avcodec/mjpegdec: Check escape sequence validity

Fixes assertion failure
Fixes: asan_heap-oob_1c1a4ea_1242_cov_2274415971_TESTcmyk.jpg

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit afa92907f3c6a0c3bdad766ec8d938ee17ee1c9e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mpc8: Use uint64_t in *_get_v() to avoid undefined behavior
Michael Niedermayer [Wed, 4 Feb 2015 13:47:41 +0000 (14:47 +0100)]
avformat/mpc8: Use uint64_t in *_get_v() to avoid undefined behavior

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mpc8: fix broken pointer math
wm4 [Tue, 3 Feb 2015 18:04:11 +0000 (19:04 +0100)]
avformat/mpc8: fix broken pointer math

This could overflow and crash at least on 32 bit systems.

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b737a2c52857b214be246ff615c6293730033cfa)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mpc8: fix hang with fuzzed file
wm4 [Tue, 3 Feb 2015 18:04:12 +0000 (19:04 +0100)]
avformat/mpc8: fix hang with fuzzed file

This can lead to an endless loop by seeking back a few bytes after each
attempted chunk read. Assuming negative sizes are always invalid, this
is easy to fix. Other code in this demuxer treats negative sizes as
invalid as well.

Fixes ticket #4262.

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/tta: fix crash with corrupted files
wm4 [Tue, 3 Feb 2015 13:41:10 +0000 (14:41 +0100)]
avformat/tta: fix crash with corrupted files

av_add_index_entry() can fail, for example because the parameters are
invalid, or because memory allocation fails. Check this; it can actually
happen with corrupted files.

The second hunk is just for robustness. Just in case functions like
ff_reduce_index() remove entries. (Not sure if this can actually
happen.)

Fixes ticket #4294.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6a0cd529a35190d9374b0b26504e71857cd67b83)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo_enc: Fix number suffixes in rc_buffer_size calculation
Michael Niedermayer [Sun, 1 Feb 2015 18:40:13 +0000 (19:40 +0100)]
avcodec/mpegvideo_enc: Fix number suffixes in rc_buffer_size calculation

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_cabac: use int instead of long for mbb_xy
Michael Niedermayer [Sun, 1 Feb 2015 18:39:22 +0000 (19:39 +0100)]
avcodec/h264_cabac: use int instead of long for mbb_xy

The mb address fits in int

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/omadec: fix number suffix
Michael Niedermayer [Sun, 1 Feb 2015 18:36:36 +0000 (19:36 +0100)]
avformat/omadec: fix number suffix

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/smacker: Fix number suffix
Michael Niedermayer [Sun, 1 Feb 2015 18:36:13 +0000 (19:36 +0100)]
avformat/smacker: Fix number suffix

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/matroskadec: Fix number suffixes
Michael Niedermayer [Sun, 1 Feb 2015 18:34:52 +0000 (19:34 +0100)]
avformat/matroskadec: Fix number suffixes

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dxtory: Use LL instead of L number suffix
Michael Niedermayer [Sun, 1 Feb 2015 18:29:20 +0000 (19:29 +0100)]
avcodec/dxtory: Use LL instead of L number suffix

This is probably unneeded and normal int would be fine, but its
safer to use LL and this isnt speed relevant

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample/dither: Cleanup number suffixes
Michael Niedermayer [Sun, 1 Feb 2015 18:27:00 +0000 (19:27 +0100)]
swresample/dither: Cleanup number suffixes

The <<31 case needs LL

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/utils: Fix number suffixes in tb_unreliable()
Michael Niedermayer [Sun, 1 Feb 2015 18:19:25 +0000 (19:19 +0100)]
avformat/utils: Fix number suffixes in tb_unreliable()

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/APIchanges: fill in more missing hash values and dates
Michael Niedermayer [Fri, 23 Jan 2015 14:09:21 +0000 (15:09 +0100)]
doc/APIchanges: fill in more missing hash values and dates

all values before 2.5 seem to be filled in now

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/APIchanges: fill in and correct some values
Michael Niedermayer [Wed, 21 Jan 2015 13:24:08 +0000 (14:24 +0100)]
doc/APIchanges: fill in and correct some values

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/APIchanges: Add av_find_best_pix_fmt_of_2() and av_get_pix_fmt_loss()
Michael Niedermayer [Wed, 21 Jan 2015 11:27:36 +0000 (12:27 +0100)]
doc/APIchanges: Add av_find_best_pix_fmt_of_2() and av_get_pix_fmt_loss()

also add deprecation note for avcodec_get_pix_fmt_loss(), avcodec_find_best_pix_fmt_of_2()

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/APIchanges: Fill in some more missing hash values
Michael Niedermayer [Thu, 22 Jan 2015 12:09:21 +0000 (13:09 +0100)]
doc/APIchanges: Fill in some more missing hash values

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '532c96a2158c04f265d750d54f2f103b8d9fe0ef' into release/2.4
Michael Niedermayer [Fri, 13 Feb 2015 19:32:46 +0000 (20:32 +0100)]
Merge commit '532c96a2158c04f265d750d54f2f103b8d9fe0ef' into release/2.4

* commit '532c96a2158c04f265d750d54f2f103b8d9fe0ef':
  matroskadec: Fix read-after-free in matroska_read_seek()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '891de4b27a07b808839b9e873b6a886248c8fd6b' into release/2.4
Michael Niedermayer [Fri, 13 Feb 2015 19:29:11 +0000 (20:29 +0100)]
Merge commit '891de4b27a07b808839b9e873b6a886248c8fd6b' into release/2.4

* commit '891de4b27a07b808839b9e873b6a886248c8fd6b':
  log: Unbreak no-tty support on 256color terminals

Conflicts:
libavutil/log.c

No change, FFmpeg is not affected by this bug
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/dctdnoiz: fix slice_h computation
Clément Bœsch [Sun, 8 Feb 2015 13:27:51 +0000 (14:27 +0100)]
avfilter/dctdnoiz: fix slice_h computation

ceilf() can only work if the reminder of the division is not 0.

This fixes memory errors with for instance:
  ffmpeg -f lavfi -i testsrc=s=800x500 -threads 3 -vf dctdnoiz -frames:v 1 -f null -

(cherry picked from commit eb7efaa9244720c5f2051d76d76faeec864eca7a)

4 years agomatroskadec: Fix read-after-free in matroska_read_seek()
Xiaohan Wang [Thu, 6 Nov 2014 20:59:54 +0000 (12:59 -0800)]
matroskadec: Fix read-after-free in matroska_read_seek()

In matroska_read_seek(), |tracks| is assigned at the begining of the
function. However, functions like matroska_parse_cues() could reallocate
the tracks and invalidate |tracks|.

This assigns |tracks| only before using it, so that it will not get
invalidated elsewhere.

Bug-Id: chromium/427266

4 years agolog: Unbreak no-tty support on 256color terminals
Luca Barbato [Fri, 12 Sep 2014 22:26:21 +0000 (00:26 +0200)]
log: Unbreak no-tty support on 256color terminals

4 years agoMerge commit '4039f11ed82d84009b5146f0a563f33ced33e4db' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 02:56:09 +0000 (03:56 +0100)]
Merge commit '4039f11ed82d84009b5146f0a563f33ced33e4db' into release/2.4

* commit '4039f11ed82d84009b5146f0a563f33ced33e4db':
  Prepare for 11.2 Release

Conflicts:
RELEASE

Merge for metadata only as this is not correct for 2.4.*

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5f6f2412211609e46d3f3573f4ac4e136534f1d4' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 02:54:58 +0000 (03:54 +0100)]
Merge commit '5f6f2412211609e46d3f3573f4ac4e136534f1d4' into release/2.4

* commit '5f6f2412211609e46d3f3573f4ac4e136534f1d4':
  doc: Update the Changelog for release 11.2

Conflicts:
Changelog

No change as the changelog is not correct for FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ff77fa754bf2d6e7231d2e050babefa9a13d1fec' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 02:52:53 +0000 (03:52 +0100)]
Merge commit 'ff77fa754bf2d6e7231d2e050babefa9a13d1fec' into release/2.4

* commit 'ff77fa754bf2d6e7231d2e050babefa9a13d1fec':
  vp7: fix checking vp7_feature_value_size()

See: 28f8114bd240712e5c2a9b52df519858fccc267c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '431f57f0467244686ae63a3d06a8cf51f60090ed' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 02:27:11 +0000 (03:27 +0100)]
Merge commit '431f57f0467244686ae63a3d06a8cf51f60090ed' into release/2.4

* commit '431f57f0467244686ae63a3d06a8cf51f60090ed':
  libopusenc: prevent an out-of-bounds read by returning early

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '88411b87b4bb3c5820ec232f26ba4a284c11a7f9' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 02:22:15 +0000 (03:22 +0100)]
Merge commit '88411b87b4bb3c5820ec232f26ba4a284c11a7f9' into release/2.4

* commit '88411b87b4bb3c5820ec232f26ba4a284c11a7f9':
  display: fix order of operands

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3f09d4f6d43468dbc9307bb937516a32287008dc' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 02:21:35 +0000 (03:21 +0100)]
Merge commit '3f09d4f6d43468dbc9307bb937516a32287008dc' into release/2.4

* commit '3f09d4f6d43468dbc9307bb937516a32287008dc':
  ffv1: fix out-of-bounds read

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3aba00b1b331461611d32cfd56ebe8334f6d1b93' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 02:03:06 +0000 (03:03 +0100)]
Merge commit '3aba00b1b331461611d32cfd56ebe8334f6d1b93' into release/2.4

* commit '3aba00b1b331461611d32cfd56ebe8334f6d1b93':
  indeo3: check ff_set_dimensions return value

See: 81ed7efbe24ef1b3d98c9e256d2a9332c1797ffd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '796bd81835ebcb69d40bc87b33f13924a5937a1b' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 02:00:31 +0000 (03:00 +0100)]
Merge commit '796bd81835ebcb69d40bc87b33f13924a5937a1b' into release/2.4

* commit '796bd81835ebcb69d40bc87b33f13924a5937a1b':
  g2meet: check ff_set_dimensions return value

Conflicts:
libavcodec/g2meet.c

See: 3af9d8269ea2878fb7960ab5ed52f4a75c73e6ec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9e0a38d32b36fac7fd73bdb93e820ae0b9e03616' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:59:01 +0000 (02:59 +0100)]
Merge commit '9e0a38d32b36fac7fd73bdb93e820ae0b9e03616' into release/2.4

* commit '9e0a38d32b36fac7fd73bdb93e820ae0b9e03616':
  avs: check ff_set_dimensions return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '39e07ac9fcaf3d412f9a33f427072e8ded032d24' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:57:48 +0000 (02:57 +0100)]
Merge commit '39e07ac9fcaf3d412f9a33f427072e8ded032d24' into release/2.4

* commit '39e07ac9fcaf3d412f9a33f427072e8ded032d24':
  ansi: check ff_set_dimensions return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '21aeae9c679657a1537d0d9127eff280bafc901a' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:39:51 +0000 (02:39 +0100)]
Merge commit '21aeae9c679657a1537d0d9127eff280bafc901a' into release/2.4

* commit '21aeae9c679657a1537d0d9127eff280bafc901a':
  svq1enc: check ff_get_buffer return value

Conflicts:
libavcodec/svq1enc.c

See: 7effc26ba74717bb9c808d96791c7cf98911d1a1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'dd195c2c587f44dbc4be7f059ed182f7d83e6cb4' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:39:17 +0000 (02:39 +0100)]
Merge commit 'dd195c2c587f44dbc4be7f059ed182f7d83e6cb4' into release/2.4

* commit 'dd195c2c587f44dbc4be7f059ed182f7d83e6cb4':
  on2avc: Fix out of array access

See: ce6a1ff2a124b3b0e8530bca1b6eed5a368feb5a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '29e720da76ca353dbda9f881562902b41c355b77' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:38:24 +0000 (02:38 +0100)]
Merge commit '29e720da76ca353dbda9f881562902b41c355b77' into release/2.4

* commit '29e720da76ca353dbda9f881562902b41c355b77':
  librtmp: append the correct field to the string

See: d1970929b5f8b873aac171586343c9d8142897ad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/librtmp: fix swfurl
Michael Niedermayer [Sun, 9 Nov 2014 11:36:23 +0000 (12:36 +0100)]
avformat/librtmp: fix swfurl

Found-by: JULIAN GARDNER <joolzg@btinternet.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d1970929b5f8b873aac171586343c9d8142897ad)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '61fdbf7ff64c0ae1bdd6a8d573092dc6924c1dba' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:34:25 +0000 (02:34 +0100)]
Merge commit '61fdbf7ff64c0ae1bdd6a8d573092dc6924c1dba' into release/2.4

* commit '61fdbf7ff64c0ae1bdd6a8d573092dc6924c1dba':
  lavc: fix bitshifts amount bigger than the type

Conflicts:
libavcodec/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '93bf4a74de99300fdc0deb83f672bf12e6f1c262' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:27:17 +0000 (02:27 +0100)]
Merge commit '93bf4a74de99300fdc0deb83f672bf12e6f1c262' into release/2.4

* commit '93bf4a74de99300fdc0deb83f672bf12e6f1c262':
  configure: Fix enabling memalign_hack automatically

Conflicts:
configure

See: 3d93ba562243b6d8afac3c875c05304d41da94bf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '527617485914004dc8b772056322ea5ae74c800d' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:26:41 +0000 (02:26 +0100)]
Merge commit '527617485914004dc8b772056322ea5ae74c800d' into release/2.4

* commit '527617485914004dc8b772056322ea5ae74c800d':
  lavc: Move the libtwolame encoder registration to the list for external libraries

Conflicts:
libavcodec/allcodecs.c

See: f5f98727b361c62d3962cef37a100db95d62b702
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '32701252af65014bb68194bb61d67ec1882ae75d' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:25:52 +0000 (02:25 +0100)]
Merge commit '32701252af65014bb68194bb61d67ec1882ae75d' into release/2.4

* commit '32701252af65014bb68194bb61d67ec1882ae75d':
  xwma: Do not leak on failure path

Conflicts:
libavformat/xwma.c

See: 375a0c03a9a401a328a94b3d9f5338ab1524f7ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '4d11e4b47db6387077682595d53e9a17b50511cb' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:25:08 +0000 (02:25 +0100)]
Merge commit '4d11e4b47db6387077682595d53e9a17b50511cb' into release/2.4

* commit '4d11e4b47db6387077682595d53e9a17b50511cb':
  libtwolame: prevent a NULL pointer dereference

See: a586b3d9b1df9099c18d3e15c9b261f6612ad2ac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavcodec/libtwolame: fix null pointer dereference
Paul B Mahol [Mon, 13 Oct 2014 12:22:41 +0000 (12:22 +0000)]
libavcodec/libtwolame: fix null pointer dereference

Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit a586b3d9b1df9099c18d3e15c9b261f6612ad2ac)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5891fd017aa7bed4c423b8511090cf8641a0afa4' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:14:57 +0000 (02:14 +0100)]
Merge commit '5891fd017aa7bed4c423b8511090cf8641a0afa4' into release/2.4

* commit '5891fd017aa7bed4c423b8511090cf8641a0afa4':
  dvdsubdec: Do not leak on failure path

Conflicts:
libavcodec/dvdsubdec.c

See: 7fa9f7ef1c2f0cee81ec6ea6a4ff10af4c4fc62c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e9aeaa6441f6fd18fc951d9737887dcf8a9584c0' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:14:19 +0000 (02:14 +0100)]
Merge commit 'e9aeaa6441f6fd18fc951d9737887dcf8a9584c0' into release/2.4

* commit 'e9aeaa6441f6fd18fc951d9737887dcf8a9584c0':
  qdm2: avoid integer overflow

See: ccfd8cffe867d534447dbc5beb96ff39e65e2791
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'cce99f72d1b49d3dfee859136eeff3db32553750' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:13:32 +0000 (02:13 +0100)]
Merge commit 'cce99f72d1b49d3dfee859136eeff3db32553750' into release/2.4

* commit 'cce99f72d1b49d3dfee859136eeff3db32553750':
  mpegenc: prevent a NULL pointer dereference

See: 010adacbe2363a5f98d62db8fae7b0009552b801
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'fbc20c3b85be169389b6c9f8806a311d3dea91ea' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:12:58 +0000 (02:12 +0100)]
Merge commit 'fbc20c3b85be169389b6c9f8806a311d3dea91ea' into release/2.4

* commit 'fbc20c3b85be169389b6c9f8806a311d3dea91ea':
  aacdec: avoid an out-of-bounds write

Conflicts:
libavcodec/aacdec.c

See: ba02069a8e22985a9a775dac9ece6dc54a7e8b44
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '484e015dc8b9983297e9269b406c65084daf4528' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:01:50 +0000 (02:01 +0100)]
Merge commit '484e015dc8b9983297e9269b406c65084daf4528' into release/2.4

* commit '484e015dc8b9983297e9269b406c65084daf4528':
  cook: Make sure there is enough extradata

See: c9e455432988acd414990ba92f782b8e3c4b6aea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b82170336f90d06c645d8252ddeccfc92c2f9ccb' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:00:54 +0000 (02:00 +0100)]
Merge commit 'b82170336f90d06c645d8252ddeccfc92c2f9ccb' into release/2.4

* commit 'b82170336f90d06c645d8252ddeccfc92c2f9ccb':
  tiffenc: initialize return value

Conflicts:
libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '12e1a7013a53ad957c4ff11a3aebc0763024d24b' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:00:00 +0000 (02:00 +0100)]
Merge commit '12e1a7013a53ad957c4ff11a3aebc0763024d24b' into release/2.4

* commit '12e1a7013a53ad957c4ff11a3aebc0763024d24b':
  roqaudio: Always use the frame buffer on flush

Conflicts:
libavcodec/roqaudioenc.c

See: a1af505d6640a89401f8e9941a38352a1ca49d58
See: c0b17ea106b94f79255f81ec36ea50096e1ae985
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e7ee74485b436c34591177c18c8643764a55d516' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:59:25 +0000 (01:59 +0100)]
Merge commit 'e7ee74485b436c34591177c18c8643764a55d516' into release/2.4

* commit 'e7ee74485b436c34591177c18c8643764a55d516':
  hnm4: Use av_image_check_size

See: e23b18321fb5cffb6e05d0b0ef00de9733f560da
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '4edbb0955e043d698dcc1b5073b6e714f9cc7960' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:42:09 +0000 (01:42 +0100)]
Merge commit '4edbb0955e043d698dcc1b5073b6e714f9cc7960' into release/2.4

* commit '4edbb0955e043d698dcc1b5073b6e714f9cc7960':
  png_parser: fix size of chunk_lenght

Conflicts:
libavcodec/png_parser.c

See: 2ee6dca3b8f40132be5c8b77e3700a9e3f26c382
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '2a75c0b1ca16b5480497de0d4c79ef122406a0b5' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:41:16 +0000 (01:41 +0100)]
Merge commit '2a75c0b1ca16b5480497de0d4c79ef122406a0b5' into release/2.4

* commit '2a75c0b1ca16b5480497de0d4c79ef122406a0b5':
  aacsbr: change order of operation to prevent out of array read

Conflicts:
libavcodec/aacsbr.c

See: c2340831b8e9032716acb0aab4893d3cc500213a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '34e7f70f9f493f340daab80eba4f12d005ec3e63' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:40:31 +0000 (01:40 +0100)]
Merge commit '34e7f70f9f493f340daab80eba4f12d005ec3e63' into release/2.4

* commit '34e7f70f9f493f340daab80eba4f12d005ec3e63':
  assdec: check av_new_packet return value

Conflicts:
libavformat/assdec.c

See: 7c9f9685ae2d45d5bbb939483a01266622e8f14c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '242fc6394fecb403bcbd0f652920f2647d0b08ae' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:39:47 +0000 (01:39 +0100)]
Merge commit '242fc6394fecb403bcbd0f652920f2647d0b08ae' into release/2.4

* commit '242fc6394fecb403bcbd0f652920f2647d0b08ae':
  mtv: improve header check and avoid division by zero

Conflicts:
libavformat/mtv.c

See: 8b9b6332dfeb169098c8ab1351d66fc5b474dd55
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'bae05e5326703dad3bfe0ed5b31ba73ee9254515' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:33:20 +0000 (01:33 +0100)]
Merge commit 'bae05e5326703dad3bfe0ed5b31ba73ee9254515' into release/2.4

* commit 'bae05e5326703dad3bfe0ed5b31ba73ee9254515':
  matroskaenc: write correct Display{Width, Height} in stereo encoding

Conflicts:
libavformat/matroskaenc.c

See: 6103faaa51d2f46d6ccecaad9a089b4b42ff66ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '26ba78adacd8469fca97c8c833e2e6364b13b7c8' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:29:55 +0000 (01:29 +0100)]
Merge commit '26ba78adacd8469fca97c8c833e2e6364b13b7c8' into release/2.4

* commit '26ba78adacd8469fca97c8c833e2e6364b13b7c8':
  mov: fix assigment check

Conflicts:
libavformat/mov.c

See: af2e5061bbcabf5eae780929fa25784b6127759e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8a982092cc3436c25d68ec15b27277c176ce0061' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:29:13 +0000 (01:29 +0100)]
Merge commit '8a982092cc3436c25d68ec15b27277c176ce0061' into release/2.4

* commit '8a982092cc3436c25d68ec15b27277c176ce0061':
  mxfdec: add missing break

See: cbda76c7c65c5c0a4d5de03baad96c4a940c7336
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '19fc283dbb53a5f7d6658fd4edcfa59b99369b58' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:22:14 +0000 (01:22 +0100)]
Merge commit '19fc283dbb53a5f7d6658fd4edcfa59b99369b58' into release/2.4

* commit '19fc283dbb53a5f7d6658fd4edcfa59b99369b58':
  lavf: replace rename() with ff_rename()

Conflicts:
libavformat/hdsenc.c
libavformat/internal.h

See: 95d2fc6a76f3e0a98329f1ca70f98e7c085f0abf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b9b689550e7531b1a2cc893d2af623e37f266936' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:19:35 +0000 (01:19 +0100)]
Merge commit 'b9b689550e7531b1a2cc893d2af623e37f266936' into release/2.4

* commit 'b9b689550e7531b1a2cc893d2af623e37f266936':
  img2dec: check av_new_packet return value

Conflicts:
libavformat/img2dec.c

See: 3f8148911c6e6e1f2a042bd4ca3ad8516a92130c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7c710c38f6481b892e01d3c1e4781ad160b2935e' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:18:49 +0000 (01:18 +0100)]
Merge commit '7c710c38f6481b892e01d3c1e4781ad160b2935e' into release/2.4

* commit '7c710c38f6481b892e01d3c1e4781ad160b2935e':
  audiointerleave: check av_new_packet return value

Conflicts:
libavformat/audiointerleave.c

See: 3ca8a2328878ebdb203e49d0a060df1b5337a370
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a7e79f6a43bdc7e3b164dd78b060f0d5575a0cf0' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:11:20 +0000 (01:11 +0100)]
Merge commit 'a7e79f6a43bdc7e3b164dd78b060f0d5575a0cf0' into release/2.4

* commit 'a7e79f6a43bdc7e3b164dd78b060f0d5575a0cf0':
  avfilter: check filter link validity

Conflicts:
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '556a5090f2b0a20fd9998e1a327875f5b0c8d1d5' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:10:43 +0000 (01:10 +0100)]
Merge commit '556a5090f2b0a20fd9998e1a327875f5b0c8d1d5' into release/2.4

* commit '556a5090f2b0a20fd9998e1a327875f5b0c8d1d5':
  mp3dec: fix reading the Xing tag

Conflicts:
libavformat/mp3dec.c

See: 19ff479f694ddccc1fd1fa00eff94f96ca82671b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '1551602b423755c4ed98c5b7b2c2d6504416726e' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:09:57 +0000 (01:09 +0100)]
Merge commit '1551602b423755c4ed98c5b7b2c2d6504416726e' into release/2.4

* commit '1551602b423755c4ed98c5b7b2c2d6504416726e':
  nutdec: check av_new_packet return value

Conflicts:
libavformat/nutdec.c

See: bb502411ddb9fe1928d4a999693a3a49b83f8698
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '4cd0041d38664adcb6f4b3038e277631b85d5dc8' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:03:58 +0000 (01:03 +0100)]
Merge commit '4cd0041d38664adcb6f4b3038e277631b85d5dc8' into release/2.4

* commit '4cd0041d38664adcb6f4b3038e277631b85d5dc8':
  rmdec: check av_new_packet return value

Conflicts:
libavformat/rmdec.c

See: c01a462cda8d7f298a3ac6d20752d23a11e43a8a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd1ad85fc020653be5ad25ed1d3d5091e89fee782' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:03:06 +0000 (01:03 +0100)]
Merge commit 'd1ad85fc020653be5ad25ed1d3d5091e89fee782' into release/2.4

* commit 'd1ad85fc020653be5ad25ed1d3d5091e89fee782':
  vf_format: check input validity

See: ee16e0cacc16ea60c35a66796410012755263c3c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '6cf27b550d66963b89b5917568b85c4b49fb18ba' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:02:25 +0000 (01:02 +0100)]
Merge commit '6cf27b550d66963b89b5917568b85c4b49fb18ba' into release/2.4

* commit '6cf27b550d66963b89b5917568b85c4b49fb18ba':
  aviobuf: check context before using it

See: 7441d1ec330da810a0ffd44a02b2fc60add5b719
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5aceced0a0d235d485e88fda502019b221dbf3d2' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:01:42 +0000 (01:01 +0100)]
Merge commit '5aceced0a0d235d485e88fda502019b221dbf3d2' into release/2.4

* commit '5aceced0a0d235d485e88fda502019b221dbf3d2':
  avio: fix sizeof argument

See: a96577df38469e5075caa416d3374576d9ab64ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>