ffmpeg.git
7 years agoMerge commit 'ae3822bca16f1cdb2460a35b16f8ef636a04314e'
Michael Niedermayer [Wed, 21 Nov 2012 17:00:56 +0000 (18:00 +0100)]
Merge commit 'ae3822bca16f1cdb2460a35b16f8ef636a04314e'

* commit 'ae3822bca16f1cdb2460a35b16f8ef636a04314e':
  imgconvert: remove PixFmtInfo

Conflicts:
libavcodec/imgconvert.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoimgconvert: fix color type for non normal pix_fmts like HW stuff and unused entries.
Michael Niedermayer [Wed, 21 Nov 2012 16:37:32 +0000 (17:37 +0100)]
imgconvert: fix color type for non normal pix_fmts like HW stuff and unused entries.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec_get_pix_fmt_loss: remove PixFmtInfo use
Michael Niedermayer [Wed, 21 Nov 2012 16:22:25 +0000 (17:22 +0100)]
avcodec_get_pix_fmt_loss: remove PixFmtInfo use

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoimgconvert: print color type too
Michael Niedermayer [Wed, 21 Nov 2012 16:32:21 +0000 (17:32 +0100)]
imgconvert: print color type too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocdxl: use url_feof()
Paul B Mahol [Wed, 21 Nov 2012 16:36:05 +0000 (16:36 +0000)]
cdxl: use url_feof()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoimgconvert: remove PixFmtInfo use from avg_bits_per_pixel()
Michael Niedermayer [Wed, 21 Nov 2012 15:47:02 +0000 (16:47 +0100)]
imgconvert: remove PixFmtInfo use from avg_bits_per_pixel()

This fixes several inconsistencies with YUV >8bit formats caused
due to missing information in the PixFmtInfo table.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec_find_best_pix_fmt_of_2: favor formats with fewer components if it does not...
Michael Niedermayer [Wed, 21 Nov 2012 15:59:37 +0000 (16:59 +0100)]
avcodec_find_best_pix_fmt_of_2: favor formats with fewer components if it does not incur a loss.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopixdesc: add av_get_padded_bits_per_pixel()
Michael Niedermayer [Wed, 21 Nov 2012 15:45:54 +0000 (16:45 +0100)]
pixdesc: add av_get_padded_bits_per_pixel()

This will be needed to allow removing the PixFmtInfo table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoimgconvert-test: add avg bits per pixel
Michael Niedermayer [Wed, 21 Nov 2012 15:14:25 +0000 (16:14 +0100)]
imgconvert-test: add avg bits per pixel

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agois_yuv_planar: remove use of PixFmtInfo
Michael Niedermayer [Wed, 21 Nov 2012 15:11:01 +0000 (16:11 +0100)]
is_yuv_planar: remove use of PixFmtInfo

This fixes the behavior for a few yuva 16bit formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoimgconvert: add self test code
Michael Niedermayer [Wed, 21 Nov 2012 15:10:42 +0000 (16:10 +0100)]
imgconvert: add self test code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorawenc: cosmetics: reindent
Paul B Mahol [Wed, 21 Nov 2012 15:34:45 +0000 (15:34 +0000)]
rawenc: cosmetics: reindent

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480'
Michael Niedermayer [Wed, 21 Nov 2012 14:14:32 +0000 (15:14 +0100)]
Merge commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480'

* commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480':
  avcodec: split avpicture from imgconvert
  pixdesc: add PIX_FMT_ALPHA flag

Conflicts:
libavcodec/imgconvert.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosierravmd: signal EOF
Piotr Bandurski [Wed, 21 Nov 2012 10:38:52 +0000 (10:38 +0000)]
sierravmd: signal EOF

7 years agocafdec: return right code if EOF is reached
Paul B Mahol [Tue, 20 Nov 2012 11:43:37 +0000 (11:43 +0000)]
cafdec: return right code if EOF is reached

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agothp: signal EOF
Piotr Bandurski [Wed, 21 Nov 2012 10:21:54 +0000 (10:21 +0000)]
thp: signal EOF

7 years agorpl: return AVERROR_EOF instead of -1
Piotr Bandurski [Wed, 21 Nov 2012 09:48:46 +0000 (09:48 +0000)]
rpl: return AVERROR_EOF instead of -1

7 years agolavf/hls: whitespace cosmetics after 23db5418.
Clément Bœsch [Wed, 21 Nov 2012 07:01:51 +0000 (08:01 +0100)]
lavf/hls: whitespace cosmetics after 23db5418.

7 years agolavf: move libmodplug registration with the other ext lib.
Clément Bœsch [Wed, 21 Nov 2012 07:00:35 +0000 (08:00 +0100)]
lavf: move libmodplug registration with the other ext lib.

Also remove the duplicated #if.

7 years agohls: create an AVProgram for each variant
LYF [Fri, 16 Nov 2012 06:12:27 +0000 (14:12 +0800)]
hls: create an AVProgram for each variant

Without the information, application may choose audio from one variant
and video from another variant, which leads to fetch two variants from
network. This enables av_find_best_stream() to find matching audio and
video streams, so that only one variant is fetched from network.

Signed-off-by: LYF <yefei.li@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/segment: fix value for the M3U8 EXT-X-MEDIA
Stefano Sabatini [Sat, 17 Nov 2012 16:21:43 +0000 (17:21 +0100)]
lavf/segment: fix value for the M3U8 EXT-X-MEDIA

From the M3U8 specification:
|The EXT-X-MEDIA-SEQUENCE tag indicates the sequence number of the first
|URI that appears in a Playlist file.

Previously it was using the list index number. Also remove now unused
list_count field.

7 years agolavf/segment: do not pre-increment segment_idx value
Stefano Sabatini [Sat, 17 Nov 2012 16:20:29 +0000 (17:20 +0100)]
lavf/segment: do not pre-increment segment_idx value

Increment the value just when a new segment with the given index is
started. Simplify logic, improve readability.

7 years agolavf/segment: unbreak behavior for segment muxer
Stefano Sabatini [Sat, 17 Nov 2012 16:12:43 +0000 (17:12 +0100)]
lavf/segment: unbreak behavior for segment muxer

The segment muxer presumes the use of AVFMT_GLOBALHEADER, ssegment should
be use in case of formats which requires no global headers.

Regression introduced when merging
0826d8513d14f54da0b519360813327d5836b7fc.

7 years agolavf/segment: consistently use "seg" in segment_start()
Stefano Sabatini [Sat, 17 Nov 2012 15:35:51 +0000 (16:35 +0100)]
lavf/segment: consistently use "seg" in segment_start()

7 years agoffmpeg: rework debugging timestamp logs in process_input()
Stefano Sabatini [Sat, 17 Nov 2012 10:12:04 +0000 (11:12 +0100)]
ffmpeg: rework debugging timestamp logs in process_input()

Print timestamps before and after ffmpeg timestamp postprocessing.
Help to debug how ffmpeg processes the input timestamps.

7 years agolavf/srtdec: trim line break event separators from packet.
Clément Bœsch [Sat, 10 Nov 2012 23:06:58 +0000 (00:06 +0100)]
lavf/srtdec: trim line break event separators from packet.

The muxer add them automatically, so this avoid having a bunch of line
breaks all over the output files. One '\n' is still kept/added because
the lavc subrip decoder seems to have trouble with line ending abruptly
(it doesn't flush correctly the tags). This bug is harmless but should
be fixed; though, this doesn't look like a trivial change. When this bug
gets fixed, we can consider removing the '\n' at the end of the packet.

The 2048B buffer limit was also removed while moving to AVBPrint API.
Note that this doesn't really matter since the decoder is limited as
well.

7 years agoAdd -skip_initial_bytes option.
Carl Eugen Hoyos [Tue, 20 Nov 2012 21:04:14 +0000 (22:04 +0100)]
Add -skip_initial_bytes option.

Fixes ticket #1909.

7 years agoCorrectly signal EOF when demuxing caf files.
Carl Eugen Hoyos [Tue, 20 Nov 2012 21:04:03 +0000 (22:04 +0100)]
Correctly signal EOF when demuxing caf files.

7 years agoswr: include stdint.h instead of inttypes.h.
Clément Bœsch [Tue, 20 Nov 2012 20:51:25 +0000 (21:51 +0100)]
swr: include stdint.h instead of inttypes.h.

stdint.h is for the [u]int*_t types, which is the only thing we need for
the prototypes. inttypes.h includes stdint.h and defines more thing we
don't need here.

Bump micro in case a user app was relying on this include for its own
code.

7 years agorc: fix 10l typo in rc_max_available_vbv_use calculation
Michael Niedermayer [Tue, 20 Nov 2012 19:47:38 +0000 (20:47 +0100)]
rc: fix 10l typo in  rc_max_available_vbv_use calculation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: increase pcm coverage
Paul B Mahol [Tue, 20 Nov 2012 18:13:25 +0000 (18:13 +0000)]
fate: increase pcm coverage

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoswr: fix a few typo in the public header.
Clément Bœsch [Tue, 20 Nov 2012 19:29:05 +0000 (20:29 +0100)]
swr: fix a few typo in the public header.

7 years agoswr-doxy: elaborate on swr_get_delay() and the timebase
Michael Niedermayer [Tue, 20 Nov 2012 19:05:08 +0000 (20:05 +0100)]
swr-doxy: elaborate on swr_get_delay() and the timebase

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: general doxy text about swr and example code.
Michael Niedermayer [Mon, 19 Nov 2012 22:46:34 +0000 (23:46 +0100)]
swr: general doxy text about swr and example code.

Based on doxy from avr
Reviewed-by: Clément Bœsch
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/segment: do not copy codec_tag when not available
ChanMin Kim [Sat, 17 Nov 2012 16:39:51 +0000 (17:39 +0100)]
lavf/segment: do not copy codec_tag when not available

Some muxers do not allow stream if codec_tag is incompatible.

Sometimes the passed input codec's codec_tag is not compatible with the
output muxer.

Because the codec_tag field of the segment muxer cannot be set, ffmpeg.c
doesn't know how to handle these cases.

Signed-off-by: ChanMin Kim <kcm1700@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agothe hyperlink to the Developer's Certificate of Origin no longer works; use Linux...
Peter Ross [Mon, 19 Nov 2012 23:15:53 +0000 (10:15 +1100)]
the hyperlink to the Developer's Certificate of Origin no longer works; use Linux kernel hyperlink

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoadd some planar PCM encoders
Paul B Mahol [Mon, 19 Nov 2012 09:19:30 +0000 (09:19 +0000)]
add some planar PCM encoders

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agopcmdec: use memcpy() when possible for planar decoders
Paul B Mahol [Tue, 20 Nov 2012 16:51:46 +0000 (16:51 +0000)]
pcmdec: use memcpy() when possible for planar decoders

This is faster (at least with clang).

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agooggdec: fix memleak on header parsing failure
Michael Niedermayer [Tue, 20 Nov 2012 14:12:37 +0000 (15:12 +0100)]
oggdec: fix memleak on header parsing failure

Fixes Ticket1931

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/platform: replace link to site arrozcru.org with link to ffmpeg.zeranoe.com
Stefano Sabatini [Tue, 20 Nov 2012 13:54:58 +0000 (14:54 +0100)]
doc/platform: replace link to site arrozcru.org with link to ffmpeg.zeranoe.com

ffmpeg.arrozcru.org is currently unmaintained, and it redirects to
ffmpeg.zeranoe.com.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 20 Nov 2012 13:35:24 +0000 (14:35 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  FATE: add 24-bit ALAC tests
  FATE: rename ALAC tests from alac-* to alac-16-*

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopcmenc: use ENCODE macro for pcm_s8
Paul B Mahol [Tue, 20 Nov 2012 13:18:56 +0000 (13:18 +0000)]
pcmenc: use ENCODE macro for pcm_s8

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agopcm: revert from libavs planar code to durandals.
Michael Niedermayer [Tue, 20 Nov 2012 13:04:38 +0000 (14:04 +0100)]
pcm: revert from libavs planar code to durandals.

The libav code does not work on big endian.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '7c278d2ae410a64bdd89f1777026b4b963c30a1a'
Michael Niedermayer [Tue, 20 Nov 2012 12:34:27 +0000 (13:34 +0100)]
Merge commit '7c278d2ae410a64bdd89f1777026b4b963c30a1a'

* commit '7c278d2ae410a64bdd89f1777026b4b963c30a1a':
  alacenc: support 24-bit encoding
  pcmdec: use planar sample format for pcm_s16le_planar
  vorbisdec: use float planar sample format

Conflicts:
libavcodec/pcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoimgconvert: remove PixFmtInfo
Luca Barbato [Sat, 17 Nov 2012 19:34:41 +0000 (20:34 +0100)]
imgconvert: remove PixFmtInfo

It is pleonastic and was used in stale functions pending replacement.

7 years agoavcodec: split avpicture from imgconvert
Luca Barbato [Sun, 11 Nov 2012 23:47:57 +0000 (00:47 +0100)]
avcodec: split avpicture from imgconvert

All the non deprecated functions are in avpicture.c now.

7 years agopixdesc: add PIX_FMT_ALPHA flag
Luca Barbato [Mon, 12 Nov 2012 00:17:20 +0000 (01:17 +0100)]
pixdesc: add PIX_FMT_ALPHA flag

7 years ago8svx: move pcm_s8_planar decoder to pcm.c
Paul B Mahol [Sun, 18 Nov 2012 18:50:57 +0000 (18:50 +0000)]
8svx: move pcm_s8_planar decoder to pcm.c

Removes limitation of max 2 channels for pcm_s8_planar decoder by moving
it to more natural place.

AV_CODEC_ID_8SVX_RAW is not used by anything anymore and is going to be
removed.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years ago4xm: return error code if decode_init() failed
Paul B Mahol [Tue, 20 Nov 2012 09:42:32 +0000 (09:42 +0000)]
4xm: return error code if decode_init() failed

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoFATE: add 24-bit ALAC tests
Justin Ruggles [Fri, 9 Nov 2012 22:09:11 +0000 (17:09 -0500)]
FATE: add 24-bit ALAC tests

7 years agoalacenc: support 24-bit encoding
Justin Ruggles [Fri, 9 Nov 2012 22:01:09 +0000 (17:01 -0500)]
alacenc: support 24-bit encoding

7 years agoFATE: rename ALAC tests from alac-* to alac-16-*
Justin Ruggles [Fri, 9 Nov 2012 22:05:24 +0000 (17:05 -0500)]
FATE: rename ALAC tests from alac-* to alac-16-*

This will distinguish ALAC 16-bit tests from ALAC tests with other bit
depths.

7 years agopcmdec: use planar sample format for pcm_s16le_planar
Justin Ruggles [Tue, 28 Aug 2012 15:12:40 +0000 (11:12 -0400)]
pcmdec: use planar sample format for pcm_s16le_planar

7 years agovorbisdec: use float planar sample format
Justin Ruggles [Wed, 29 Aug 2012 02:43:05 +0000 (22:43 -0400)]
vorbisdec: use float planar sample format

7 years agoaacsbr: check sample_rate before using it, fix division by 0
Michael Niedermayer [Tue, 20 Nov 2012 02:20:43 +0000 (03:20 +0100)]
aacsbr: check sample_rate before using it, fix division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years ago4xmdec: fix integer overflow, null ptr dereference
Michael Niedermayer [Tue, 20 Nov 2012 01:59:55 +0000 (02:59 +0100)]
4xmdec: fix integer overflow, null ptr dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoiff: DEEP RLE 32-bit decoder
Peter Ross [Sun, 18 Nov 2012 07:44:04 +0000 (18:44 +1100)]
iff: DEEP RLE 32-bit decoder

Fixes ticket #1046.

Signed-off-by: Peter Ross <pross@xvid.org>
7 years agomips: Optimization of AC3 FP encoder and EAC3 FP decoder
Bojan Zivkovic [Tue, 6 Nov 2012 13:06:21 +0000 (14:06 +0100)]
mips: Optimization of AC3 FP encoder and EAC3 FP decoder

Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Reveiwed-by: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: set default channel count options to 0.
Clément Bœsch [Mon, 19 Nov 2012 17:46:05 +0000 (18:46 +0100)]
swr: set default channel count options to 0.

If not set, they will be defined using the channel layout setting, which
is much more convenient when using swr_alloc() instead of
swr_alloc_set_opts().

7 years agoAllow use of @ character in username and passwords embedded in URLs
Gavin Kinsey [Thu, 15 Nov 2012 10:56:47 +0000 (10:56 +0000)]
Allow use of @ character in username and passwords embedded in URLs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopthreads: increase MAX_BUFFERS due to 24c043c98ef22b9d4aa7a54ec5f1cebd21042dd7
Michael Niedermayer [Mon, 19 Nov 2012 16:31:12 +0000 (17:31 +0100)]
pthreads: increase MAX_BUFFERS due to 24c043c98ef22b9d4aa7a54ec5f1cebd21042dd7

This might fix a hypothetical memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaf_aresample: allocate at least 1 sample buffer. Fix null ptr dereference.
Michael Niedermayer [Mon, 19 Nov 2012 14:55:23 +0000 (15:55 +0100)]
af_aresample: allocate at least 1 sample buffer. Fix null ptr dereference.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovble: remove superfluous braces
Piotr Bandurski [Mon, 19 Nov 2012 09:49:37 +0000 (10:49 +0100)]
vble: remove superfluous braces

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 19 Nov 2012 13:24:10 +0000 (14:24 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: h264_intrapred: Fix C function names in comments
  x86: SPLATD: port to cpuflags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1c5805521c3e406886341d752ebf38f8d41e1d13'
Michael Niedermayer [Mon, 19 Nov 2012 13:05:41 +0000 (14:05 +0100)]
Merge commit '1c5805521c3e406886341d752ebf38f8d41e1d13'

* commit '1c5805521c3e406886341d752ebf38f8d41e1d13':
  PGS subtitles: Set AVSubtitle pts value
  configure: Refactor CPPFLAGS settings for glibc/uclibc
  configure: add basic support for ARM AArch64
  build: set -U__STRICT_ANSI__ for newlib

Conflicts:
configure
libavcodec/pgssubdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosbr: increase f_tablelim size, it appears it was too small by 1.
Michael Niedermayer [Mon, 19 Nov 2012 04:01:01 +0000 (05:01 +0100)]
sbr: increase f_tablelim size, it appears it was too small by 1.

Prevent out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/general: remove duplicate entry for ADPCM SMJPEG IMA
Paul B Mahol [Mon, 19 Nov 2012 10:23:54 +0000 (10:23 +0000)]
doc/general: remove duplicate entry for ADPCM SMJPEG IMA

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agonut: add tag for PCM signed 8-bit planar
Paul B Mahol [Mon, 19 Nov 2012 09:54:07 +0000 (09:54 +0000)]
nut: add tag for PCM signed 8-bit planar

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agodoc/general: remove 8SVX audio, there is no such codec
Paul B Mahol [Mon, 19 Nov 2012 09:50:05 +0000 (09:50 +0000)]
doc/general: remove 8SVX audio, there is no such codec

While here add missing PCM signed 8-bit planar.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agodoc/general: move 8SVX codecs to right section
Paul B Mahol [Mon, 19 Nov 2012 09:47:33 +0000 (09:47 +0000)]
doc/general: move 8SVX codecs to right section

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoSupport iLBC in caf.
Carl Eugen Hoyos [Mon, 19 Nov 2012 09:19:50 +0000 (10:19 +0100)]
Support iLBC in caf.

7 years agoh264: dont stop parsing NALs without cleanup on DPC.
Michael Niedermayer [Mon, 19 Nov 2012 02:37:59 +0000 (03:37 +0100)]
h264: dont stop parsing NALs without cleanup on DPC.

Fixes a deadlock with frame threads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovble: do not abort when version is not 1
Piotr Bandurski [Mon, 19 Nov 2012 00:55:51 +0000 (01:55 +0100)]
vble: do not abort when version is not 1

Fixes ticket #1923.

Reviewed-by: Derek Buitenhuis
7 years agompegvideo: increase MAX_PICTURE_NUMBER.
Michael Niedermayer [Mon, 19 Nov 2012 00:36:55 +0000 (01:36 +0100)]
mpegvideo: increase MAX_PICTURE_NUMBER.

avoid abort().

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavrndec: support lowres for mjpeg
Piotr Bandurski [Mon, 5 Nov 2012 17:24:34 +0000 (18:24 +0100)]
avrndec: support lowres for mjpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoerror concealment: check that references are frames and not fields.
Michael Niedermayer [Sun, 18 Nov 2012 21:51:54 +0000 (22:51 +0100)]
error concealment: check that references are frames and not fields.

frames cant have field references.
Fixes a deadlock

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: Check gray scale CBP, fix out of array accesses.
Michael Niedermayer [Sun, 18 Nov 2012 20:36:06 +0000 (21:36 +0100)]
h264: Check gray scale CBP, fix out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoliavfi/avcodec: allow channel layouts with fewer channels than actually available.
Michael Niedermayer [Sun, 18 Nov 2012 18:26:46 +0000 (19:26 +0100)]
liavfi/avcodec: allow channel layouts with fewer channels than actually available.

This fixes the regression with Ticket1726, where some audio was lost.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopcmenc: remove dead increment
Paul B Mahol [Sun, 18 Nov 2012 21:12:25 +0000 (21:12 +0000)]
pcmenc: remove dead increment

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agopcm: move i into for loop to avoid { } inside switch statement
Paul B Mahol [Sun, 18 Nov 2012 20:43:33 +0000 (20:43 +0000)]
pcm: move i into for loop to avoid { } inside switch statement

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agofate: add mjpeg-422 and mjpeg-444 tests
Paul B Mahol [Sun, 18 Nov 2012 18:03:45 +0000 (18:03 +0000)]
fate: add mjpeg-422 and mjpeg-444 tests

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoff_h264_direct_ref_list_init: fix B slice check.
Michael Niedermayer [Sun, 18 Nov 2012 17:46:05 +0000 (18:46 +0100)]
ff_h264_direct_ref_list_init: fix B slice check.

Fixes null pointer dereference.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomjpegenc: yuvj444p support
Paul B Mahol [Wed, 7 Nov 2012 21:44:27 +0000 (21:44 +0000)]
mjpegenc: yuvj444p support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agox86: h264_intrapred: Fix C function names in comments
Diego Biurrun [Wed, 14 Nov 2012 00:47:11 +0000 (01:47 +0100)]
x86: h264_intrapred: Fix C function names in comments

Function names changed after switching to declaration with
PRED4x4/8x8/8x8L/16x16 macros in the C code.

7 years agoPGS subtitles: Set AVSubtitle pts value
John Stebbins [Fri, 2 Nov 2012 16:30:39 +0000 (09:30 -0700)]
PGS subtitles: Set AVSubtitle pts value

pts should be that of the packet containing the presentation segment.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agox86: SPLATD: port to cpuflags
Diego Biurrun [Sun, 15 Jul 2012 16:33:59 +0000 (18:33 +0200)]
x86: SPLATD: port to cpuflags

7 years agolavfi/frei0r: in init() check path loop, free resources in a single point
Stefano Sabatini [Fri, 16 Nov 2012 09:58:37 +0000 (10:58 +0100)]
lavfi/frei0r: in init() check path loop, free resources in a single point

7 years agolavfi/frei0r: extend load_path() to support arbitrarily long paths
Stefano Sabatini [Fri, 16 Nov 2012 09:45:25 +0000 (10:45 +0100)]
lavfi/frei0r: extend load_path() to support arbitrarily long paths

7 years agoh264: correct ref count check and limit, fix out of array accesses.
Michael Niedermayer [Sun, 18 Nov 2012 15:29:04 +0000 (16:29 +0100)]
h264: correct ref count check and limit, fix out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: fix integer overflow, assert failure
Michael Niedermayer [Sun, 18 Nov 2012 14:23:54 +0000 (15:23 +0100)]
h264: fix integer overflow, assert failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoff_mpeg_update_thread_context: assert context unequality
Michael Niedermayer [Sun, 18 Nov 2012 01:56:29 +0000 (02:56 +0100)]
ff_mpeg_update_thread_context: assert context unequality

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopp: add SSE2 deInterlaceInterpolateCubic().
Clément Bœsch [Sat, 17 Nov 2012 10:03:45 +0000 (11:03 +0100)]
pp: add SSE2 deInterlaceInterpolateCubic().

2124 decicycles in deInterlaceInterpolateCubic_C, 67100774 runs, 8090 skips
458 decicycles in deInterlaceInterpolateCubic_MMX2, 67107146 runs, 1718 skips
382 decicycles in deInterlaceInterpolateCubic_SSE2, 67107086 runs, 1778 skips

7 years agopp: add support for SSE2.
Clément Bœsch [Fri, 16 Nov 2012 23:09:01 +0000 (00:09 +0100)]
pp: add support for SSE2.

7 years agolavfi/mp/pp: use PP_CPU_CAPS_AUTO.
Clément Bœsch [Sun, 18 Nov 2012 14:12:37 +0000 (15:12 +0100)]
lavfi/mp/pp: use PP_CPU_CAPS_AUTO.

7 years agopp: add auto detection cpu flag.
Clément Bœsch [Wed, 14 Nov 2012 22:21:56 +0000 (23:21 +0100)]
pp: add auto detection cpu flag.

7 years agopp: add various const for pointers.
Clément Bœsch [Fri, 16 Nov 2012 22:43:50 +0000 (23:43 +0100)]
pp: add various const for pointers.

7 years agolavfi/drawtext: implement more generic expansion.
Nicolas George [Sat, 10 Nov 2012 18:46:37 +0000 (19:46 +0100)]
lavfi/drawtext: implement more generic expansion.

The new expansion mechanism uses the %{...} notation.
For compatibility reasons, it must be enabled explicitly,
but a warning is printed if a conflict is likely to happen.

7 years agoiff: decode HAM8 images with masking correctly.
Piotr Bandurski [Sun, 18 Nov 2012 14:48:22 +0000 (15:48 +0100)]
iff: decode HAM8 images with masking correctly.

Fixes ticket #967.

Reviewed-by: Peter Ross
7 years agoh264: Skip odd NALs in extradata, prevent undefined behavior
Michael Niedermayer [Sun, 18 Nov 2012 13:23:06 +0000 (14:23 +0100)]
h264: Skip odd NALs in extradata, prevent undefined behavior

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: let av_find_best_stream use bitrate info if available
Marton Balint [Sun, 18 Nov 2012 12:19:14 +0000 (13:19 +0100)]
lavf: let av_find_best_stream use bitrate info if available

I guess the user expects to see the stream with the highest bitrate, not with
the most frames, this is especially useful for multi bitrate streams.

This patch changes av_find_best_stream to select the stream based on a number
of conditions, the first condition has the highest priority, the last condition
has the lowest:

1) Select the stream with the highest FFMIN(5, codec_info_nb_frames) value
2) Select the stream with the highest bitrate
3) Select the stream with the highest codec_info_nb_frames
4) Select the first stream

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>