ffmpeg.git
5 years agolavfi/fieldorder: remove redundant get_video_buffer()
Paul B Mahol [Fri, 6 Sep 2013 13:58:59 +0000 (13:58 +0000)]
lavfi/fieldorder: remove redundant get_video_buffer()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agos302m: s/bits_per_coded_sample/bits_per_raw_sample
Paul B Mahol [Fri, 6 Sep 2013 16:32:47 +0000 (16:32 +0000)]
s302m: s/bits_per_coded_sample/bits_per_raw_sample

bits_per_coded_sample should be set from demuxer and
not from decoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/xan: use uint8_t instead of unsigned char
Paul B Mahol [Fri, 6 Sep 2013 17:18:17 +0000 (17:18 +0000)]
avcodec/xan: use uint8_t instead of unsigned char

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agopixfmt: add native GBRAP16 format
Paul B Mahol [Fri, 6 Sep 2013 16:59:32 +0000 (16:59 +0000)]
pixfmt: add native GBRAP16 format

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agolavfi: Weston 3 Field Deinterlacing Filter
Paul B Mahol [Wed, 4 Sep 2013 12:59:18 +0000 (12:59 +0000)]
lavfi: Weston 3 Field Deinterlacing Filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 6 Sep 2013 11:50:46 +0000 (13:50 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avisynth: K&R formatting cosmetics

Conflicts:
libavformat/avisynth.c

Nothing changed as the avisynth code has been rewritten to
support avi/avxsynth in ffmpeg.
And the new code should be free of formating problems.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '97b052e56807fab6887e9ba210a28a622e6a4b78'
Michael Niedermayer [Fri, 6 Sep 2013 11:33:01 +0000 (13:33 +0200)]
Merge commit '97b052e56807fab6887e9ba210a28a622e6a4b78'

* commit '97b052e56807fab6887e9ba210a28a622e6a4b78':
  avisynth: Add missing #include for NULL_IF_CONFIG_SMALL

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'befe044bb9561c9d7d6559db06bba375e82a4b66'
Michael Niedermayer [Fri, 6 Sep 2013 11:17:12 +0000 (13:17 +0200)]
Merge commit 'befe044bb9561c9d7d6559db06bba375e82a4b66'

* commit 'befe044bb9561c9d7d6559db06bba375e82a4b66':
  avcodec: Stop exporting the removed audio_resample* symbols

Conflicts:
libavcodec/libavcodec.v

Not merged as theres no pressing need to remove it now.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29'
Michael Niedermayer [Fri, 6 Sep 2013 11:00:47 +0000 (13:00 +0200)]
Merge commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29'

* commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29':
  mpeg12enc: K&R formatting cosmetics

Conflicts:
libavcodec/mpeg12enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '66f091053f11a8957b2175480d2f368d2cf4474c'
Michael Niedermayer [Fri, 6 Sep 2013 10:34:09 +0000 (12:34 +0200)]
Merge commit '66f091053f11a8957b2175480d2f368d2cf4474c'

* commit '66f091053f11a8957b2175480d2f368d2cf4474c':
  mpeg12enc: drop forward declarations

Conflicts:
libavcodec/mpeg12enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c3e6e8f06c42499bd020fd0b37f9542150e6067b'
Michael Niedermayer [Fri, 6 Sep 2013 10:21:16 +0000 (12:21 +0200)]
Merge commit 'c3e6e8f06c42499bd020fd0b37f9542150e6067b'

* commit 'c3e6e8f06c42499bd020fd0b37f9542150e6067b':
  mem: Do not check unsigned values for negative size

Conflicts:
libavutil/mem.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b634b36fcebfe16b837b6c4044f5d5cb99a75040'
Michael Niedermayer [Fri, 6 Sep 2013 10:05:02 +0000 (12:05 +0200)]
Merge commit 'b634b36fcebfe16b837b6c4044f5d5cb99a75040'

* commit 'b634b36fcebfe16b837b6c4044f5d5cb99a75040':
  mem: Improve documentation wording and spelling

Conflicts:
libavutil/mem.c
libavutil/mem.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavisynth: K&R formatting cosmetics
Diego Biurrun [Wed, 4 Sep 2013 18:01:59 +0000 (20:01 +0200)]
avisynth: K&R formatting cosmetics

5 years agoavisynth: Add missing #include for NULL_IF_CONFIG_SMALL
Diego Biurrun [Wed, 4 Sep 2013 18:03:14 +0000 (20:03 +0200)]
avisynth: Add missing #include for NULL_IF_CONFIG_SMALL

5 years agoavcodec/mjpegdec: support >8bit in mjpeg_decode_scan_progressive_ac()
Michael Niedermayer [Fri, 6 Sep 2013 00:33:10 +0000 (02:33 +0200)]
avcodec/mjpegdec: support >8bit in mjpeg_decode_scan_progressive_ac()

Fixes Ticket2812

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: move shift_output() to its own function
Michael Niedermayer [Fri, 6 Sep 2013 00:31:32 +0000 (02:31 +0200)]
avcodec/mjpegdec: move shift_output() to its own function

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: 12bit Grayscale support
Michael Niedermayer [Thu, 5 Sep 2013 22:57:50 +0000 (00:57 +0200)]
avcodec/mjpegdec: 12bit Grayscale support

Fixes part of Ticket2812

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: Fix normal jpeg with bits < 8
Michael Niedermayer [Thu, 5 Sep 2013 22:56:44 +0000 (00:56 +0200)]
avcodec/mjpegdec: Fix normal jpeg with bits < 8

Untested due to lack of testcase

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec fix last_dc for bits != 8
Michael Niedermayer [Thu, 5 Sep 2013 22:55:32 +0000 (00:55 +0200)]
avcodec/mjpegdec fix last_dc for bits != 8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dsputil: add 12bit simple idct
Michael Niedermayer [Thu, 5 Sep 2013 22:10:45 +0000 (00:10 +0200)]
avcodec/dsputil: add 12bit simple idct

Will be needed for jpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavfi/mp: remove mp=fil
Paul B Mahol [Thu, 5 Sep 2013 20:22:47 +0000 (20:22 +0000)]
lavfi/mp: remove mp=fil

The filter does not work correctly most of time.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec: Stop exporting the removed audio_resample* symbols
Diego Biurrun [Thu, 5 Sep 2013 10:05:57 +0000 (12:05 +0200)]
avcodec: Stop exporting the removed audio_resample* symbols

5 years agolavfi/mp: remove mp=dint
Paul B Mahol [Wed, 4 Sep 2013 11:43:06 +0000 (11:43 +0000)]
lavfi/mp: remove mp=dint

There are better and actually maintained filters that have similar
functionality.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agompeg12enc: K&R formatting cosmetics
Vittorio Giovara [Wed, 4 Sep 2013 15:17:30 +0000 (17:17 +0200)]
mpeg12enc: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoavfilter/vf_yadif: Treat mode as a field of flags
Michael Niedermayer [Thu, 5 Sep 2013 18:53:12 +0000 (20:53 +0200)]
avfilter/vf_yadif: Treat mode as a field of flags

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_yadif: fix "incompatible pointer type" warning
Michael Niedermayer [Thu, 5 Sep 2013 17:58:45 +0000 (19:58 +0200)]
avfilter/vf_yadif: fix "incompatible pointer type" warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_yadif: add gbr(a)p support
Michael Niedermayer [Thu, 5 Sep 2013 12:06:17 +0000 (14:06 +0200)]
avfilter/vf_yadif: add gbr(a)p support

Suggested-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 5 Sep 2013 11:34:37 +0000 (13:34 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  matroskaenc: Allow chapters to be written in trailer

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompeg12enc: drop forward declarations
Vittorio Giovara [Wed, 4 Sep 2013 15:17:29 +0000 (17:17 +0200)]
mpeg12enc: drop forward declarations

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agomem: Do not check unsigned values for negative size
Diego Biurrun [Wed, 4 Sep 2013 10:28:01 +0000 (12:28 +0200)]
mem: Do not check unsigned values for negative size

5 years agomem: Improve documentation wording and spelling
Diego Biurrun [Wed, 4 Sep 2013 10:27:09 +0000 (12:27 +0200)]
mem: Improve documentation wording and spelling

5 years agoavcodec/mjpegdec: Simplify masking in ljpeg_decode_yuv_scan()
Michael Niedermayer [Wed, 4 Sep 2013 23:32:51 +0000 (01:32 +0200)]
avcodec/mjpegdec: Simplify masking in ljpeg_decode_yuv_scan()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: fix rgb ljpeg prediction 5/6/7 with point_transform
Michael Niedermayer [Wed, 4 Sep 2013 23:29:31 +0000 (01:29 +0200)]
avcodec/mjpegdec: fix rgb ljpeg prediction 5/6/7 with point_transform

untested due to lack of sample

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: fix yuv ljpeg prediction 5/6/7 with point transforms
Michael Niedermayer [Wed, 4 Sep 2013 23:25:59 +0000 (01:25 +0200)]
avcodec/mjpegdec: fix yuv ljpeg prediction 5/6/7 with point transforms

Fixes Ticket2826

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/jpeg2000dec: make SOC finding code more robust
Michael Niedermayer [Tue, 23 Jul 2013 02:12:04 +0000 (04:12 +0200)]
avcodec/jpeg2000dec: make SOC finding code more robust

Fixes file from Ticket860

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: make "unknown colorspace" error more informative
Michael Niedermayer [Wed, 4 Sep 2013 22:39:04 +0000 (00:39 +0200)]
avcodec/mjpegdec: make "unknown colorspace" error more informative

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: Add some sanity checks to ljpeg_decode_rgb_scan()
Michael Niedermayer [Wed, 4 Sep 2013 22:36:44 +0000 (00:36 +0200)]
avcodec/mjpegdec: Add some sanity checks to ljpeg_decode_rgb_scan()

These prevent the rgb ljpeg code from being run on parameters that it doesnt
support. No testcase available but it seems possible to trigger these.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/APIchanges: update hashes and dates after last two commits.
Clément Bœsch [Wed, 4 Sep 2013 20:18:59 +0000 (22:18 +0200)]
doc/APIchanges: update hashes and dates after last two commits.

Sorry, I'm too lazy to fix the rest.

5 years agoavcodec: make avcodec_close() more tolerant.
Clément Bœsch [Tue, 3 Sep 2013 20:25:17 +0000 (22:25 +0200)]
avcodec: make avcodec_close() more tolerant.

See previous commit.

5 years agoavformat: make avformat_close_input() more tolerant.
Clément Bœsch [Tue, 3 Sep 2013 20:22:19 +0000 (22:22 +0200)]
avformat: make avformat_close_input() more tolerant.

The purpose of this commit is to make error management simpler and less
error prone, just like av_free() which is safe with NULL.

5 years agotools/crypto_bench: fix 2 typos.
Clément Bœsch [Wed, 4 Sep 2013 17:51:33 +0000 (19:51 +0200)]
tools/crypto_bench: fix 2 typos.

5 years agoavcodec/avpacket: zero memory in av_packet_new_side_data()
Michael Niedermayer [Wed, 4 Sep 2013 19:00:24 +0000 (21:00 +0200)]
avcodec/avpacket: zero memory in av_packet_new_side_data()

This ensures that no uninitialized bytes cause non-deterministic behavior.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomatroskaenc: Allow chapters to be written in trailer
John Stebbins [Tue, 3 Sep 2013 17:53:34 +0000 (10:53 -0700)]
matroskaenc: Allow chapters to be written in trailer

This allows creation of frame accurate chapter marks from sources like
DVD and BD where the precise chapter location is not known until the
chapter mark has been reached during reading.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agolavc/avfft: init context to 0.
Nicolas George [Thu, 22 Aug 2013 18:25:09 +0000 (20:25 +0200)]
lavc/avfft: init context to 0.

Prevent an invalid free in case of init failure.

5 years agoffprobe: show bitmap subtitles size.
Nicolas George [Tue, 3 Sep 2013 14:39:02 +0000 (16:39 +0200)]
ffprobe: show bitmap subtitles size.

Fix trac ticket #2930.

5 years agolavc/libvorbisdec: do not return empty frames.
Nicolas George [Tue, 3 Sep 2013 18:05:06 +0000 (20:05 +0200)]
lavc/libvorbisdec: do not return empty frames.

Some parts of the code have been known to react badly to
empty frames; they should not, but there is no need to
take risks.

5 years agotools: add benchmark for crypto functions.
Nicolas George [Thu, 16 May 2013 18:10:11 +0000 (20:10 +0200)]
tools: add benchmark for crypto functions.

The benchmark tests the speed of the following algorithms:
MD5, SHA-1, SHA-256, SHA-512, RIPEMD-160, AES-128.

It can optionally be built to perform the same benchmark on
other crypto libraries, for comparison purposes.
The supported libraries are:
- crypto:   OpenSSL's libcrypto;
- gcrypt:   GnuTLS's libgcrypt;
- tomcrypt: LibTomCrypt
To enable them, use this syntax:
make VERSUS=crypto+gcrypt+tomcrypt tools/crypto_bench
They do not need to have been enabled in configure.

5 years agodoc/examples: fix lib math dep for resampling_audio.
Clément Bœsch [Wed, 4 Sep 2013 13:49:18 +0000 (15:49 +0200)]
doc/examples: fix lib math dep for resampling_audio.

It uses at least sin()

5 years agoavcodec: fix AVpacket → AVPacket typo.
Clément Bœsch [Wed, 4 Sep 2013 13:48:11 +0000 (15:48 +0200)]
avcodec: fix AVpacket → AVPacket typo.

5 years agodoc/examples: remove extra "the".
Clément Bœsch [Wed, 4 Sep 2013 13:46:01 +0000 (15:46 +0200)]
doc/examples: remove extra "the".

"into the doc/examples directory" vs "into doc/examples".

5 years agoavcodec: add emuedge_linesize_type
Michael Niedermayer [Wed, 4 Sep 2013 12:22:20 +0000 (14:22 +0200)]
avcodec: add emuedge_linesize_type

Currently all uses of the emu edge code as well as the code itself
assume int linesize
changing some but not changing all would introduce a security issue
once all use this typedef a simple search and replace can be
done to switch them all to ptrdiff_t

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

* qatar/master:
  mpegvideo: Avoid 32-bit wrapping of linesize multiplications

This is not merged as its not correct for ffmpeg and would introduce a
security issue if merged as is.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0ebfdae099d2749240b6a565abcdf0bf62589748'
Michael Niedermayer [Wed, 4 Sep 2013 12:06:46 +0000 (14:06 +0200)]
Merge commit '0ebfdae099d2749240b6a565abcdf0bf62589748'

* commit '0ebfdae099d2749240b6a565abcdf0bf62589748':
  doc: Describe TB option of setpts filter

Conflicts:
doc/filters.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b4ec7a5fee644ad9882e10c097817b65447b8e55'
Michael Niedermayer [Wed, 4 Sep 2013 11:48:29 +0000 (13:48 +0200)]
Merge commit 'b4ec7a5fee644ad9882e10c097817b65447b8e55'

* commit 'b4ec7a5fee644ad9882e10c097817b65447b8e55':
  mem: Document the av_realloc family of functions properly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompegvideo: Avoid 32-bit wrapping of linesize multiplications
Martin Storsjö [Tue, 3 Sep 2013 22:36:51 +0000 (01:36 +0300)]
mpegvideo: Avoid 32-bit wrapping of linesize multiplications

This makes sure that linesize * start_y doesn't overflow, so that
emulated_edge_mc can get back the original value if needed.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoMerge commit '7f9e893f56db52078e0f46677ed337b2e25fa94d'
Michael Niedermayer [Wed, 4 Sep 2013 11:15:00 +0000 (13:15 +0200)]
Merge commit '7f9e893f56db52078e0f46677ed337b2e25fa94d'

* commit '7f9e893f56db52078e0f46677ed337b2e25fa94d':
  build: Report an error message when a pc file is not found

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'af11fa5409cc72fc45ca7f3527400beca10967b9'
Michael Niedermayer [Wed, 4 Sep 2013 11:04:29 +0000 (13:04 +0200)]
Merge commit 'af11fa5409cc72fc45ca7f3527400beca10967b9'

* commit 'af11fa5409cc72fc45ca7f3527400beca10967b9':
  mjpegb: Detect changing number of planes in interlaced video

Conflicts:
libavcodec/mjpegdec.c

See: ecc31630f9a16ead4272a078c281afcb4db87f21
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '35cbc98b720db95b923cb2d745f77bb2ee4363dc'
Michael Niedermayer [Wed, 4 Sep 2013 10:56:28 +0000 (12:56 +0200)]
Merge commit '35cbc98b720db95b923cb2d745f77bb2ee4363dc'

* commit '35cbc98b720db95b923cb2d745f77bb2ee4363dc':
  alac: Check that the channels fit at the given offset

Conflicts:
libavcodec/alac.c

See: b53f89710b03c4c832bb03e4e132b1ace17fb4e4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: Describe TB option of setpts filter
Clifford Wolf [Sun, 1 Sep 2013 09:07:17 +0000 (11:07 +0200)]
doc: Describe TB option of setpts filter

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoMerge commit 'd719981273bc779c7d1e879d88404fd867f93a0e'
Michael Niedermayer [Wed, 4 Sep 2013 10:20:53 +0000 (12:20 +0200)]
Merge commit 'd719981273bc779c7d1e879d88404fd867f93a0e'

* commit 'd719981273bc779c7d1e879d88404fd867f93a0e':
  4xm: Check that the read track value is non-negative

Conflicts:
libavformat/4xm.c

See: 0838cfdc8a10185604db5cd9d6bffad71279a0e8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5bcd3ae5b167fb74215520b01d5d810e0c8986ab'
Michael Niedermayer [Wed, 4 Sep 2013 10:06:36 +0000 (12:06 +0200)]
Merge commit '5bcd3ae5b167fb74215520b01d5d810e0c8986ab'

* commit '5bcd3ae5b167fb74215520b01d5d810e0c8986ab':
  matroskadec: Check that .lang was allocated and set before reading it

Conflicts:
libavformat/matroskadec.c

See: 01fd1aa0ad2b95045df35f94ee9de073d24609c8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f7c5883126f9440547933eefcf000aa78af4821c'
Michael Niedermayer [Wed, 4 Sep 2013 09:50:54 +0000 (11:50 +0200)]
Merge commit 'f7c5883126f9440547933eefcf000aa78af4821c'

* commit 'f7c5883126f9440547933eefcf000aa78af4821c':
  alac: Limit max_samples_per_frame

See: 3920d1387834e2bc334aff9f518f4beb24e470bd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomem: Document the av_realloc family of functions properly
Luca Barbato [Sun, 1 Sep 2013 17:46:59 +0000 (19:46 +0200)]
mem: Document the av_realloc family of functions properly

realloc() does not accept pointers from memalign().

5 years agobuild: Report an error message when a pc file is not found
Luca Barbato [Tue, 3 Sep 2013 20:15:23 +0000 (22:15 +0200)]
build: Report an error message when a pc file is not found

Ease tracking path problems.

5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Tue, 3 Sep 2013 23:51:07 +0000 (01:51 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Show subtitle resolution in avcodec_string().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: assert position monotonicity in ff_find_last_ts()
Michael Niedermayer [Tue, 3 Sep 2013 22:58:16 +0000 (00:58 +0200)]
avformat/utils: assert position monotonicity in ff_find_last_ts()

This ensures that no read timestamp functions finds packets before the search window in ff_find_last_ts()
which could cause an infinite loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoShow subtitle resolution in avcodec_string().
Carl Eugen Hoyos [Tue, 3 Sep 2013 23:04:01 +0000 (01:04 +0200)]
Show subtitle resolution in avcodec_string().

5 years agoavformat/mpegts: Ensure that mpegts_get_dts() only considers packets at or after...
Michael Niedermayer [Tue, 3 Sep 2013 22:55:38 +0000 (00:55 +0200)]
avformat/mpegts: Ensure that mpegts_get_dts() only considers packets at or after the given position

This fixes an infinite loop
An alternative fix would be to revert d73cbc22c5f2c305838d9867538cf4ad59c4035f
but that would worsen error resilience.

Found-by: Justin Ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: Force diff into text mode
Michael Niedermayer [Tue, 3 Sep 2013 21:54:01 +0000 (23:54 +0200)]
fate: Force diff into text mode

On openbsd the exif-image-jpg test fails but diff treats the files as
binary due to some non ascii symbols in them. This should force it to
treat them as text, which should result in more informative output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pictordec: remove y checks, which have become redundant
Michael Niedermayer [Tue, 3 Sep 2013 19:49:12 +0000 (21:49 +0200)]
avcodec/pictordec: remove y checks, which have become redundant

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pictordec: run av_image_check_size() unconditionally
Michael Niedermayer [Tue, 3 Sep 2013 19:45:25 +0000 (21:45 +0200)]
avcodec/pictordec: run av_image_check_size() unconditionally

This ensures that no invalid size leaks through
(This issue is hypothetical, ive no testcase)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavfi/mptestsrc: use outlink->frame_count
Paul B Mahol [Tue, 3 Sep 2013 17:31:05 +0000 (17:31 +0000)]
lavfi/mptestsrc: use outlink->frame_count

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agomjpegb: Detect changing number of planes in interlaced video
Michael Niedermayer [Sat, 10 Mar 2012 21:02:46 +0000 (22:02 +0100)]
mjpegb: Detect changing number of planes in interlaced video

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoalac: Check that the channels fit at the given offset
Martin Storsjö [Tue, 3 Sep 2013 11:16:40 +0000 (14:16 +0300)]
alac: Check that the channels fit at the given offset

The code tries to decode a number of channels at the
offset given by the ff_alac_channel_layout_offsets table.
Even if the number of channels decoded so far doesn't
exceed the total number of channels, we need to check that
we actually can decode that number of channels at this offset
as well.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years ago4xm: Check that the read track value is non-negative
Martin Storsjö [Tue, 3 Sep 2013 10:53:23 +0000 (13:53 +0300)]
4xm: Check that the read track value is non-negative

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agomatroskadec: Check that .lang was allocated and set before reading it
Martin Storsjö [Tue, 3 Sep 2013 09:10:50 +0000 (12:10 +0300)]
matroskadec: Check that .lang was allocated and set before reading it

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoalac: Limit max_samples_per_frame
Martin Storsjö [Tue, 3 Sep 2013 08:54:03 +0000 (11:54 +0300)]
alac: Limit max_samples_per_frame

Otherwise buffer size calculations in allocate_buffers could
overflow later, making the code think a large enough buffer
actually was allocated.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agolavfi/drawtext: add generic timeline interface and deprecate "draw".
Clément Bœsch [Tue, 20 Aug 2013 18:56:39 +0000 (20:56 +0200)]
lavfi/drawtext: add generic timeline interface and deprecate "draw".

5 years agoUpdate copyrights where my email appears with the new one.
Clément Bœsch [Tue, 3 Sep 2013 18:42:24 +0000 (20:42 +0200)]
Update copyrights where my email appears with the new one.

5 years agoavformat/mpl2dec: handle files with CRLF linebreaks correctly
wm4 [Wed, 7 Aug 2013 23:04:36 +0000 (01:04 +0200)]
avformat/mpl2dec: handle files with CRLF linebreaks correctly

Skip the "\r" as normal text. Otherwise it will be the first character
of the string passed to sscanf(), which then fill fail to match the
timestamps.

Signed-off-by: Clément Bœsch <u@pkh.me>
5 years agoavformat: H265 demuxer
Dirk Farin [Mon, 2 Sep 2013 12:33:14 +0000 (14:33 +0200)]
avformat: H265 demuxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavfi/hue: relicense to LGPL with permission by all contributors
Paul B Mahol [Tue, 3 Sep 2013 17:07:53 +0000 (17:07 +0000)]
lavfi/hue: relicense to LGPL with permission by all contributors

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agox86/simple_idct: use LOCAL_ALIGNED instead of DECLARE_ALIGNED
Paul B Mahol [Mon, 2 Sep 2013 22:02:59 +0000 (22:02 +0000)]
x86/simple_idct: use LOCAL_ALIGNED instead of DECLARE_ALIGNED

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

The filter was ported to a native libavfilter filter.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Conflicts:
libavformat/utils.c

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

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

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

Conflicts:
libavcodec/pictordec.c

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

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

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

Conflicts:
libavcodec/pictordec.c

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

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

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

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

Conflicts:
libavcodec/vcr1.c

See: 845724c82c1a732ab398c9e8cedd178f96f1626d
See: 8e09482e4d27d65bbce2ce5c2f4392216011ed09
Merged-by: Michael Niedermayer <michaelni@gmx.at>