ffmpeg.git
6 years agoavformat/dtsdec: Improve probe, reject things looking like analog signals
Michael Niedermayer [Fri, 26 Jul 2013 02:09:30 +0000 (04:09 +0200)]
avformat/dtsdec: Improve probe, reject things looking like analog signals

Fixes Ticket2810

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

Conflicts:
libavformat/dtsdec.c

6 years agompeg12: Ignore slice threading if hwaccel is active
Rémi Denis-Courmont [Wed, 24 Jul 2013 16:50:43 +0000 (19:50 +0300)]
mpeg12: Ignore slice threading if hwaccel is active

Slice threading does not work with hardware acceleration, as decoding
is per-picture.  This fixes Bugzilla #542.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
(cherry picked from commit 93a51984a27f3ba84d4e6f13d0c704ee9891603e)

Conflicts:
libavcodec/mpeg12dec.c

6 years agoswscale/input: fix 16bit gbrp input
Michael Niedermayer [Fri, 19 Jul 2013 02:19:23 +0000 (04:19 +0200)]
swscale/input: fix 16bit gbrp input

Fixes Ticket2793

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

Conflicts:
libswscale/input.c

6 years agoavformat/matroskadec: Detect conflicting sample rate/default_duration
Michael Niedermayer [Mon, 15 Jul 2013 15:13:45 +0000 (17:13 +0200)]
avformat/matroskadec: Detect conflicting sample rate/default_duration

Fixes Ticket2508

Thanks-to: Moritz Bunkus
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6158a3bcdf52fafc1d9ae9eb358a56c614b23aa3)

6 years agoMerge remote-tracking branch 'jamrial/release/1.2' into release/1.2
Michael Niedermayer [Sun, 14 Jul 2013 23:20:38 +0000 (01:20 +0200)]
Merge remote-tracking branch 'jamrial/release/1.2' into release/1.2

* jamrial/release/1.2:
  oggparseskeleton: avoid header parsing failure
  oggparseskeleton: Replace avpriv_report_missing_feature() with a normal av_log() call
  oggparseskeleton: Fix fisbone header parsing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/af_earwax: Fix out of array accesses on odd packets
Michael Niedermayer [Wed, 10 Jul 2013 14:39:10 +0000 (16:39 +0200)]
avfilter/af_earwax: Fix out of array accesses on odd packets

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

Conflicts:

libavfilter/af_earwax.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/qdm2: initialize sign_bits
Michael Niedermayer [Wed, 10 Jul 2013 14:21:33 +0000 (16:21 +0200)]
avcodec/qdm2: initialize sign_bits

Fixes non deterministic output

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/qdm2: store bits in an integer instead of float variable
Michael Niedermayer [Wed, 10 Jul 2013 14:18:52 +0000 (16:18 +0200)]
avcodec/qdm2: store bits in an integer instead of float variable

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoatrac3: fix error handling
Luca Barbato [Mon, 8 Jul 2013 23:03:13 +0000 (01:03 +0200)]
atrac3: fix error handling

decode_tonal_components returns a proper AVERROR.

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoindeo: Properly forward the error codes
Luca Barbato [Sun, 30 Jun 2013 07:57:56 +0000 (09:57 +0200)]
indeo: Properly forward the error codes

If the tile data size does not match the buffer size it did not
return an AVERROR_INVALIDDATA causing futher corruption later.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
(cherry picked from commit 7388c0c58601477db076e2e74e8b11f8a644384a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoupdate all trac links to use the trac subdomain
Michael Niedermayer [Sat, 29 Jun 2013 17:46:33 +0000 (19:46 +0200)]
update all trac links to use the trac subdomain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/utils: Keep internal and external av_read_frame() packets in sync.
Dale Curtis [Wed, 22 May 2013 22:17:08 +0000 (15:17 -0700)]
avformat/utils: Keep internal and external av_read_frame() packets in sync.

Otherwise, during error conditions, the caller will be left with
dangling pointers to a destructed packet => boom.

BUG=242786
TEST=ffmpeg_regression_tests

Commit slightly simplified by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c54a1565f512858ccfa70392f40f11c098bc1b63)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompeg12dec: avoid reinitialization on PS changes when possible.
Michael Niedermayer [Mon, 8 Jul 2013 19:46:20 +0000 (21:46 +0200)]
mpeg12dec: avoid reinitialization on PS changes when possible.

Fixes Ticket2574

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

Conflicts:
libavcodec/mpeg12dec.c

6 years agomp3dec: detect CBR and use CBR axiom to seek
Michael Niedermayer [Sun, 7 Jul 2013 11:15:32 +0000 (13:15 +0200)]
mp3dec: detect CBR and use CBR axiom to seek

This should also work reasonable with truncated and growing mp3s.
Fixes Ticket2590

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

Conflicts:
libavformat/mp3dec.c

6 years agooggparseskeleton: avoid header parsing failure
Michael Niedermayer [Sat, 6 Jul 2013 21:53:19 +0000 (23:53 +0200)]
oggparseskeleton: avoid header parsing failure

Based on description by James Almer and the xiph wiki

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

6 years agooggparseskeleton: Replace avpriv_report_missing_feature() with a normal av_log()...
James Almer [Sat, 6 Jul 2013 07:34:13 +0000 (04:34 -0300)]
oggparseskeleton: Replace avpriv_report_missing_feature() with a normal av_log() call

since there should not be more than one fisbone for a given stream.

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

Conflicts:
libavformat/oggparseskeleton.c

6 years agooggparseskeleton: Fix fisbone header parsing
James Almer [Sat, 6 Jul 2013 07:34:13 +0000 (04:34 -0300)]
oggparseskeleton: Fix fisbone header parsing

start_granule should be applied to the stream referenced in the fisbone packet, not to the
Skeleton stream.
This was broken in d1f05dd18375f2f8e68372edee11436927e43ba8 and produced bogus warnings about
multiple fisbone in the same stream on files with more than one stream.

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

6 years agommsh: dont close context on seeking failure
Michael Niedermayer [Mon, 17 Jun 2013 20:03:36 +0000 (22:03 +0200)]
mmsh: dont close context on seeking failure

Fixes Ticket2581

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

6 years agoavformat/mov: Fix duration of fragmented mov
Michael Niedermayer [Sun, 7 Jul 2013 00:42:40 +0000 (02:42 +0200)]
avformat/mov: Fix duration of fragmented mov

Fixes Ticket2757

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

6 years agolibavcodec/x86/mpegvideo: Move mmx functions under HAVE_MMX_INLINE
Michael Niedermayer [Sat, 6 Jul 2013 23:29:48 +0000 (01:29 +0200)]
libavcodec/x86/mpegvideo: Move mmx functions under HAVE_MMX_INLINE

should fix ticket2755

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

6 years agoavcodec/x86/vp3dsp_init: move mmx functions under HAVE_MMX_INLINE
Michael Niedermayer [Sat, 6 Jul 2013 23:29:18 +0000 (01:29 +0200)]
avcodec/x86/vp3dsp_init: move mmx functions under HAVE_MMX_INLINE

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

6 years agompegts: only reopen pmt_cb filter if its different from the previous.
Michael Niedermayer [Fri, 5 Jul 2013 01:27:07 +0000 (03:27 +0200)]
mpegts: only reopen pmt_cb filter if its different from the previous.

Fixes Ticket2632

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

6 years agormdec: Pass AVIOContext to rm_read_metadata()
Michael Niedermayer [Mon, 1 Jul 2013 21:38:08 +0000 (23:38 +0200)]
rmdec: Pass AVIOContext to rm_read_metadata()

Fix null pointer dereference
Fixes Ticket2588

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

6 years agoavcodec/x86/dsputil_init: only use xvid idct for lowres=0
Michael Niedermayer [Mon, 1 Jul 2013 18:48:38 +0000 (20:48 +0200)]
avcodec/x86/dsputil_init: only use xvid idct for lowres=0

Fixes crash
Fixes Ticket2714

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

Conflicts:
libavcodec/x86/dsputil_init.c

6 years agoFix copying extradata to codec in mxfdec.c
Nigel Touati-Evans [Thu, 27 Jun 2013 11:28:43 +0000 (12:28 +0100)]
Fix copying extradata to codec in mxfdec.c

The code that copies any extradata from the MXFDescriptor to the codec does
not set the size, which it should otherwise the copied data is useless.

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

Conflicts:
libavformat/mxfdec.c

6 years agomathops/x86: work around inline asm miscompilation with GCC 4.8.1
Hendrik Leppkes [Sat, 15 Jun 2013 20:46:01 +0000 (22:46 +0200)]
mathops/x86: work around inline asm miscompilation with GCC 4.8.1

The volatile is not required here, and prevents a miscompilation with GCC
4.8.1 when building on x86 with --cpu=i686

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

6 years agoavdevice/x11grab: allocate just one Cursor
Michael Niedermayer [Thu, 20 Jun 2013 18:20:56 +0000 (20:20 +0200)]
avdevice/x11grab: allocate just one Cursor

Fixes resource leak and Ticket2450

Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1ee8fadb811f3b1ef370c7d6c7bf62088f1cc954)

6 years agoavformat/iff: Byte seek is unsupported
Michael Niedermayer [Thu, 20 Jun 2013 19:49:02 +0000 (21:49 +0200)]
avformat/iff: Byte seek is unsupported

Fixes Ticket2194

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

6 years agoavformat/libmodplug: Reduce the probe score for small input
Michael Niedermayer [Thu, 20 Jun 2013 23:11:45 +0000 (01:11 +0200)]
avformat/libmodplug: Reduce the probe score for small input

This ensures that theres enough data for mpeg_probe() to recognize mpeg-ps
Fixes Ticket2583

Based on code by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c605adbf562fbf535e83ae427bb681bc45e440c8)

6 years agoAutodetect idcin only if audio properties allow decoding.
Carl Eugen Hoyos [Wed, 19 Jun 2013 14:31:10 +0000 (16:31 +0200)]
Autodetect idcin only if audio properties allow decoding.

Fixes ticket #2688.
(cherry picked from commit 06bede95fcea47d2e51e8ff248c15311f335b898)

6 years agoff_gen_search: fix infinite loop
Michael Niedermayer [Tue, 18 Jun 2013 18:50:15 +0000 (20:50 +0200)]
ff_gen_search: fix infinite loop

Fixes Ticket2639

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

6 years agoff_gen_search: fix limit
Michael Niedermayer [Tue, 18 Jun 2013 18:48:53 +0000 (20:48 +0200)]
ff_gen_search: fix limit

The limit value could become slightly wrong in the last iteration

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

6 years agoff_gen_search: make step 64 bit to prevent hypothetical integer overflow
Michael Niedermayer [Tue, 18 Jun 2013 18:47:07 +0000 (20:47 +0200)]
ff_gen_search: make step 64 bit to prevent hypothetical integer overflow

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

6 years agoswresample/x86/audio_convert: add emms to CONV
Michael Niedermayer [Tue, 18 Jun 2013 00:09:46 +0000 (02:09 +0200)]
swresample/x86/audio_convert: add emms to CONV

Fixes ticket #1874

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

6 years agovaapi: return early from ff_vaapi_render_picture() without picture
Janne Grunau [Mon, 17 Jun 2013 23:56:06 +0000 (01:56 +0200)]
vaapi: return early from ff_vaapi_render_picture() without picture

Fixes an assertion when called on uninitialized frame. Spotted after
seeking in vlc.
Fixes ticket #2461.

Tested-by: Timo
Reviewed-by: Joakim Plate
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
(cherry picked from commit 2ee380aefbb92c89e8e9c7aa5846aa404919ec7c)

6 years agoalacenc: Fix missing sign_extend()
Michael Niedermayer [Wed, 12 Jun 2013 22:01:13 +0000 (00:01 +0200)]
alacenc: Fix missing sign_extend()

Fixes ticket #2497

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

6 years agoavcodec/utils: Fix encoder allocation size
Michael Niedermayer [Mon, 10 Jun 2013 22:33:27 +0000 (00:33 +0200)]
avcodec/utils: Fix encoder allocation size

Fixes Ticket2645
Found-by: Darrell Walisser
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 175e916fa20b7887bdb29809817985e481ae0888)

Conflicts:
libavcodec/utils.c

6 years agoAAC encoder: Fix rate control on twoloop.
Claudio Freire [Sat, 4 May 2013 21:36:37 +0000 (18:36 -0300)]
AAC encoder: Fix rate control on twoloop.

Fixes a case where multichannel bitrate isn't accurately
targetted by psy model alone, never achieving the target bitrate.
Now fixed.

Fixes ticket #2625.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
6 years agompegvideo: implement ff_put_h264_chroma_mc1 & ff_avg_h264_chroma_mc2
Michael Niedermayer [Sun, 2 Jun 2013 14:17:09 +0000 (16:17 +0200)]
mpegvideo: implement ff_put_h264_chroma_mc1 & ff_avg_h264_chroma_mc2

These are needed for lowres 3

Fixes Ticket2538

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

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
6 years agoh264_cavlc: fix reading skip run
Michael Niedermayer [Thu, 30 May 2013 16:30:42 +0000 (18:30 +0200)]
h264_cavlc: fix reading skip run

Fixes Ticket2606

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

6 years agoavienc: Disallow the first frame to be skiped
Michael Niedermayer [Mon, 20 May 2013 16:58:39 +0000 (18:58 +0200)]
avienc: Disallow the first frame to be skiped

Fixes Ticket2386

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

6 years agosmacker: remove av_clip_int16()
Michael Niedermayer [Mon, 20 May 2013 19:42:06 +0000 (21:42 +0200)]
smacker: remove av_clip_int16()

Fixes Ticket2425

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

6 years agoffmpeg: free threads on error conditions.
Michael Niedermayer [Tue, 14 May 2013 23:08:18 +0000 (01:08 +0200)]
ffmpeg: free threads on error conditions.

Fixes Ticket2562

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

6 years agoconfigure: Autodetect VA-API
Carl Eugen Hoyos [Fri, 17 May 2013 00:32:21 +0000 (02:32 +0200)]
configure: Autodetect VA-API

This fixes a regression (reproducible since 1.2) and restores the
behaviour of 0.6, 0.7, 0.8, 0.9, 0.10, 0.11, 1.0 and 1.1.
(cherry picked from commit 17989dcf540c13a7122663f64c09dc830ffc3a41)

6 years agoavidec: dont randomly skip packets for offseting the index
Michael Niedermayer [Fri, 17 May 2013 20:03:14 +0000 (22:03 +0200)]
avidec: dont randomly skip packets for offseting the index

Fixes Ticket2490

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

6 years agoDo not read strd chunk in avi files as H264 extradata.
Carl Eugen Hoyos [Mon, 13 May 2013 10:39:44 +0000 (12:39 +0200)]
Do not read strd chunk in avi files as H264 extradata.

Fixes ticket #2561.
(cherry picked from commit 231b3317184790b6be4b4619d96fd328f13aeabb)

6 years agoFix configure --help output for some autodetected features.
Carl Eugen Hoyos [Fri, 10 May 2013 07:55:15 +0000 (09:55 +0200)]
Fix configure --help output for some autodetected features.
(cherry picked from commit 0f05b72f19c0a07cf48c912d2a71c3fb5f7bc325)

6 years agoexr: silence warning "libavcodec/exr.c:351:9: warning: variable ret set but not used" n1.2.1
Michael Niedermayer [Wed, 13 Mar 2013 13:56:22 +0000 (14:56 +0100)]
exr: silence warning "libavcodec/exr.c:351:9: warning: variable ret set but not used"

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoupdate for 1.2.1
Michael Niedermayer [Thu, 9 May 2013 20:17:06 +0000 (22:17 +0200)]
update for 1.2.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agogifdec: reset previous Graphic Control Extension disposal type
Michael Niedermayer [Tue, 7 May 2013 14:07:27 +0000 (16:07 +0200)]
gifdec: reset previous Graphic Control Extension disposal type

This fixes out of array accesses.

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/cdgraphics: check buffer size before use
Michael Niedermayer [Tue, 7 May 2013 19:04:33 +0000 (21:04 +0200)]
avcodec/cdgraphics: check buffer size before use

Fixes out of array accesses

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosanm: Check dimensions before use
Michael Niedermayer [Tue, 7 May 2013 19:58:27 +0000 (21:58 +0200)]
sanm: Check dimensions before use

Fixes integer overflow and out of array accesses

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocmdutils: avtool -> fftool
Clément Bœsch [Sun, 31 Mar 2013 12:49:14 +0000 (14:49 +0200)]
cmdutils: avtool -> fftool
(cherry picked from commit 7d8ad6c1fa11ec548fc63427656989e0e7c6af8b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/intfloat_readwrite: include common.h for isinf()
Michael Niedermayer [Wed, 17 Apr 2013 21:16:05 +0000 (23:16 +0200)]
avutil/intfloat_readwrite: include common.h for isinf()

Solution based on rational.c, which uses isinf() too

This should fix compilation with msvc

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/intfloat_readwrite: avoid comparission with INFINITY, use isinf()
Michael Niedermayer [Wed, 17 Apr 2013 18:40:56 +0000 (20:40 +0200)]
avutil/intfloat_readwrite: avoid comparission with INFINITY, use isinf()

Should fix pgc warning

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/log: Fix context pointer used for get_category()
Michael Niedermayer [Tue, 30 Apr 2013 18:05:31 +0000 (20:05 +0200)]
avutil/log: Fix context pointer used for get_category()

Fixes calling a random pointer

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovmdav: Try to fix unpack_rle()
Michael Niedermayer [Wed, 1 May 2013 21:46:38 +0000 (23:46 +0200)]
vmdav: Try to fix unpack_rle()

This fixes out of array accesses
The code prior to this commit could not have worked, thus obviously
was untested. I was also not able to find a valid sample that uses this
code.
This fix is thus only based on the description of the format

If someone has a sample that uses unpack_rle(), please mail me.

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

Conflicts:

libavcodec/vmdav.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agommvideo/mm_decode_intra: check horizontal coordinate too
Michael Niedermayer [Thu, 2 May 2013 20:06:03 +0000 (22:06 +0200)]
mmvideo/mm_decode_intra: check horizontal coordinate too

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agommvideo/mm_decode_inter: check horizontal coordinate too
Michael Niedermayer [Thu, 2 May 2013 19:52:08 +0000 (21:52 +0200)]
mmvideo/mm_decode_inter: check horizontal coordinate too

Fixes out of array accesses

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomjpegdec: fix overlapping memcpy with upscale_v
Michael Niedermayer [Tue, 16 Apr 2013 17:53:24 +0000 (19:53 +0200)]
mjpegdec: fix overlapping memcpy with upscale_v

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosrc_movie: fix scanf string
Michael Niedermayer [Sat, 4 May 2013 22:56:39 +0000 (00:56 +0200)]
src_movie: fix scanf string

Fixes out of array accesses

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoxbmdec: fix off by one error in scanf()
Michael Niedermayer [Sat, 4 May 2013 22:23:13 +0000 (00:23 +0200)]
xbmdec: fix off by one error in scanf()

Fixes out of array access

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix heap-buffer-overflow in matroska_parse_block
Dale Curtis [Tue, 26 Mar 2013 21:12:30 +0000 (14:12 -0700)]
Fix heap-buffer-overflow in matroska_parse_block

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodpxenc: fix data offset
ArnoB [Thu, 14 Mar 2013 17:35:55 +0000 (18:35 +0100)]
dpxenc: fix data offset

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agormdec: flush audio packet on seeking
Michael Niedermayer [Sun, 17 Mar 2013 23:00:02 +0000 (00:00 +0100)]
rmdec: flush audio packet on seeking

Fixes Ticket1605

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpegvideo: Fix edge emu with lowres
Michael Niedermayer [Tue, 7 May 2013 23:18:56 +0000 (01:18 +0200)]
avcodec/mpegvideo: Fix edge emu with lowres

Fixes a few green artifacts at the top
Fixes rest of Ticket 2535

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

6 years agoavcodec/mpegvideo: Fix block height for lowres 3 interlaced blocks
Michael Niedermayer [Tue, 7 May 2013 23:17:45 +0000 (01:17 +0200)]
avcodec/mpegvideo: Fix block height for lowres 3 interlaced blocks

Fixes green trash
Fixes part of Ticket2535

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

6 years agomatroska: set "done" only during resync fail.
Reimar Döffinger [Sun, 5 May 2013 07:46:37 +0000 (09:46 +0200)]
matroska: set "done" only during resync fail.

Fixes playback of test7.mkv validation test file.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
(cherry picked from commit 762d4335aec2e5299a06bfbce15d21336af19464)

6 years agolavfi/subtitles: zero-init AVSubtitle.
Clément Bœsch [Wed, 24 Apr 2013 22:56:36 +0000 (00:56 +0200)]
lavfi/subtitles: zero-init AVSubtitle.

This avoids invalid free when the stream id doesn't match the packet
stream index.

Ticket #2501
(cherry picked from commit 035a3792c223d3b2bba79f38049bd6363b2d470d)

6 years agoFix type of shared flac table ff_flac_blocksize_table[].
Carl Eugen Hoyos [Sun, 5 May 2013 17:29:00 +0000 (19:29 +0200)]
Fix type of shared flac table ff_flac_blocksize_table[].

Fixes ticket #2533.
(cherry picked from commit a07ac1f7888fd08e42da2bed0421e74f1cfac177)

6 years agovaapi: fix argument for ff_vaapi_common_end_frame call
Janne Grunau [Thu, 14 Mar 2013 14:12:30 +0000 (15:12 +0100)]
vaapi: fix argument for ff_vaapi_common_end_frame call
(cherry picked from commit b066d90211072c7532e17c0c54d8475f10fc97ad)

6 years agolavc: fix recoded subtitles end.
Nicolas George [Sun, 7 Apr 2013 07:48:57 +0000 (09:48 +0200)]
lavc: fix recoded subtitles end.

Text subtitles packets are not 0-terminated (and if they are,
it is handled by the recoding process since 0 is a valid
Unicode code point). The terminating 0 would overwrite the
last payload octet.

OTOH, packets must be 0-padded.

Fix a problem reported in trac ticket #2431.

6 years agoSkip padding in an id3 tag in aiff files.
Carl Eugen Hoyos [Wed, 3 Apr 2013 13:45:46 +0000 (15:45 +0200)]
Skip padding in an id3 tag in aiff files.

Fixes ticket #2430.

Reviewed-by: Matthieu Bouron
(cherry picked from commit db2d3a90825025b2f5da85792e1df33280c61391)

6 years agosmacker: fix off by one error
Paul B Mahol [Wed, 3 Apr 2013 12:57:58 +0000 (12:57 +0000)]
smacker: fix off by one error

Regression since a93b572ae4f517ce0c35cf085167c318e9215908.

Fixes #2426.

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

6 years agoWrite broken aac frames to mov files instead of skipping them.
Carl Eugen Hoyos [Sat, 30 Mar 2013 07:41:46 +0000 (08:41 +0100)]
Write broken aac frames to mov files instead of skipping them.

Fixes decoding with picky media players.

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

6 years agoOnly test the first frame for missing aac_adtstoasc bistream filter.
Carl Eugen Hoyos [Tue, 26 Mar 2013 14:16:07 +0000 (15:16 +0100)]
Only test the first frame for missing aac_adtstoasc bistream filter.

Many players ignore broken aac frames, so don't abort mov or flv
muxing when encountering one, just print a warning instead.

Fixes ticket #2380.
(cherry picked from commit 1741fece7073f51efdd837a4f307ea2cdf3d1cfb)

6 years agoconfigure: Enable hwaccels without external dependencies by default.
Diego Biurrun [Fri, 22 Mar 2013 12:24:16 +0000 (13:24 +0100)]
configure: Enable hwaccels without external dependencies by default.

Fixes ticket #2368.
(cherry picked from commit 2e2ec667416d8ed345491ac360fccc94e7a4772f)

6 years agoDo not (re-)set libx264 parameter b_tff if interlaced encoding was not requested.
Carl Eugen Hoyos [Sat, 16 Mar 2013 19:13:44 +0000 (20:13 +0100)]
Do not (re-)set libx264 parameter b_tff if interlaced encoding was not requested.

Reconfiguring can break x264 lossless encoding.

Fixes ticket #2165.
(cherry picked from commit 75c7e4583f4fd727d236a12763a265502fe00988)

6 years agomem: Fix usage of memalign() on DJGPP. n1.2
Fabrizio Gennari [Sun, 10 Mar 2013 09:22:45 +0000 (10:22 +0100)]
mem: Fix usage of memalign() on DJGPP.

Credits to Khusraw of bttr-software.de forum.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
(cherry picked from commit 91b747ac78218805a79435f50587f87167569dad)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agorelease_notes: update
Michael Niedermayer [Thu, 14 Mar 2013 19:51:23 +0000 (20:51 +0100)]
release_notes: update

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoChangelog: update version
Michael Niedermayer [Thu, 14 Mar 2013 19:50:15 +0000 (20:50 +0100)]
Changelog: update version

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpegdec: be less picky on padding
Michael Niedermayer [Thu, 14 Mar 2013 16:20:44 +0000 (17:20 +0100)]
jpegdec: be less picky on padding

Fixes Ticket2353

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

6 years agompegts: clear avprograms only for removed programs
Michael Niedermayer [Mon, 4 Feb 2013 22:41:53 +0000 (23:41 +0100)]
mpegts: clear avprograms only for removed programs

Fixes Ticket2186

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

6 years agoRevert "build: disable iconv by default."
Carl Eugen Hoyos [Sat, 9 Mar 2013 17:25:22 +0000 (18:25 +0100)]
Revert "build: disable iconv by default."

This reverts commit 9ad3cd5b5f848eb3cd033be515d34296f099148b.

The misdetection on OS X should be fixed, we will only get
problem reports if auto-detection is enabled.
(cherry picked from commit 3f78f0904bfa012b171cecfae87af7c6909c8ede)

6 years agoUpdate for FFmpeg 1.2
Michael Niedermayer [Sat, 9 Mar 2013 13:31:52 +0000 (14:31 +0100)]
Update for FFmpeg 1.2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: update for 1.2
Michael Niedermayer [Fri, 8 Mar 2013 13:45:26 +0000 (14:45 +0100)]
MAINTAINERS: update for 1.2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRevert "aacdec: Reconfigure output as needed, disable pop_output_configuration()"
Michael Niedermayer [Fri, 8 Mar 2013 13:07:36 +0000 (14:07 +0100)]
Revert "aacdec: Reconfigure output as needed, disable pop_output_configuration()"

This reverts commit 60dbf2eff92f8aa4683b6dcaba9e694890258ade.

This is not needed anymore, Ticket 1694 has been fixed differently

6 years agoaacsbr: Check for envelope scalefactors overflowing
Michael Niedermayer [Fri, 8 Mar 2013 13:00:22 +0000 (14:00 +0100)]
aacsbr: Check for envelope scalefactors overflowing

This prevents various values from becoming stuck at NAN and
output to become silent
If someone knows a cleaner solution, thats welcome!

Fixes Ticket2335

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoClose output codecs if input codec initialisation fails.
Carl Eugen Hoyos [Fri, 8 Mar 2013 01:46:46 +0000 (02:46 +0100)]
Close output codecs if input codec initialisation fails.

Fixes ticket #1546 and the remaining part of ticket #1244.

6 years agoAdd dependencies for the voice fate tests.
Carl Eugen Hoyos [Fri, 8 Mar 2013 01:45:27 +0000 (02:45 +0100)]
Add dependencies for the voice fate tests.

6 years agoAdd dependencies for the flac encoding fate tests.
Carl Eugen Hoyos [Fri, 8 Mar 2013 01:44:46 +0000 (02:44 +0100)]
Add dependencies for the flac encoding fate tests.

6 years agoAdd dependencies for the aac encoding fate tests.
Carl Eugen Hoyos [Fri, 8 Mar 2013 01:44:07 +0000 (02:44 +0100)]
Add dependencies for the aac encoding fate tests.

6 years agoForce using a 64bit intermediate when calculating calendar time with av_timegm().
Carl Eugen Hoyos [Fri, 8 Mar 2013 01:42:33 +0000 (02:42 +0100)]
Force using a 64bit intermediate when calculating calendar time with av_timegm().

Fixes a fate failure with icc 13.1

6 years agompegaudio_parser: Don't ignore information from the first frame
Alexander Kojevnikov [Thu, 7 Mar 2013 05:58:59 +0000 (21:58 -0800)]
mpegaudio_parser: Don't ignore information from the first frame

Signed-off-by: Alexander Kojevnikov <alexander@kojevnikov.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaacdec: Reconfigure output as needed, disable pop_output_configuration()
Michael Niedermayer [Fri, 22 Feb 2013 23:47:38 +0000 (00:47 +0100)]
aacdec: Reconfigure output as needed, disable pop_output_configuration()

Fixes Ticket1694

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopsymodel: dont apply lowpass filters with a cutoff close to the nyquist
Michael Niedermayer [Thu, 7 Mar 2013 18:28:30 +0000 (19:28 +0100)]
psymodel: dont apply lowpass filters with a cutoff close to the nyquist

The IIR filter numerically diverges in such cases, this could easily be
fixed but would make the filter slower on some platforms

Fixes Ticket2246

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: Fix apics with aac
Michael Niedermayer [Thu, 7 Mar 2013 12:55:43 +0000 (13:55 +0100)]
avformat: Fix apics with aac

Fixes Ticket2318

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohls: fix timebase
Michael Niedermayer [Thu, 7 Mar 2013 12:42:12 +0000 (13:42 +0100)]
hls: fix timebase

Fixes Ticket1733

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 7 Mar 2013 10:50:17 +0000 (11:50 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: Deprecate the deinterlace functions in libavcodec
  h264: Integrate draw_horiz_band into ff_h264_draw_horiz_band

Conflicts:
configure
ffmpeg_opt.c
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/imgconvert.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '70762508ec5919474edb92a5b1f266fd06640f9c'
Michael Niedermayer [Thu, 7 Mar 2013 10:29:11 +0000 (11:29 +0100)]
Merge commit '70762508ec5919474edb92a5b1f266fd06640f9c'

* commit '70762508ec5919474edb92a5b1f266fd06640f9c':
  lavc: Prettify printing of codec tags containing non alphanumeric characters
  h264: Rename the jpeg_420 pixfmt list to match the common naming structure

Conflicts:
libavcodec/h264.c
libavcodec/utils.c

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