ffmpeg.git
6 years agoMake packed B-frame warning message more useful.
Reimar Döffinger [Sun, 8 Sep 2013 17:34:20 +0000 (19:34 +0200)]
Make packed B-frame warning message more useful.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agoavcodec/ffv1enc: encode slice as raw PCM in 1.4 when the buffer is too small.
Michael Niedermayer [Mon, 9 Sep 2013 18:08:42 +0000 (20:08 +0200)]
avcodec/ffv1enc: encode slice as raw PCM in 1.4 when the buffer is too small.

This limits the maximum size of encoded slices more tightly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/ffv1dec: Support decoding planes as raw PCM in 1.4
Michael Niedermayer [Mon, 9 Sep 2013 17:56:44 +0000 (19:56 +0200)]
avcodec/ffv1dec: Support decoding planes as raw PCM in 1.4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/ffv1enc: check encode_line()s return code
Michael Niedermayer [Mon, 9 Sep 2013 16:05:52 +0000 (18:05 +0200)]
avcodec/ffv1enc: check encode_line()s return code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/ffv1enc: update buffer check for 16bps
Michael Niedermayer [Mon, 9 Sep 2013 15:58:18 +0000 (17:58 +0200)]
avcodec/ffv1enc: update buffer check for 16bps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/ffv1enc: fix size used for ff_alloc_packet2()
Michael Niedermayer [Mon, 9 Sep 2013 15:36:01 +0000 (17:36 +0200)]
avcodec/ffv1enc: fix size used for ff_alloc_packet2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/util: Make size argument of ff_alloc_packet2() int64_t
Michael Niedermayer [Mon, 9 Sep 2013 15:08:03 +0000 (17:08 +0200)]
avcodec/util: Make size argument of ff_alloc_packet2() int64_t

This ensures that huge sizes dont get truncated before the check in ff_alloc_packet2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/eatgv: use av_reallocp_array() and check return value
Paul B Mahol [Mon, 9 Sep 2013 12:23:56 +0000 (12:23 +0000)]
avcodec/eatgv: use av_reallocp_array() and check return value

Fixes #2949.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/asfdec: check return value of av_mallocz()
Paul B Mahol [Mon, 9 Sep 2013 12:09:31 +0000 (12:09 +0000)]
avcodec/asfdec: check return value of av_mallocz()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/xwdenc: use AV_LOG_ERROR in error message
Paul B Mahol [Mon, 9 Sep 2013 09:51:38 +0000 (09:51 +0000)]
avcodec/xwdenc: use AV_LOG_ERROR in error message

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/bmpenc: return meaningful error code
Paul B Mahol [Mon, 9 Sep 2013 09:48:36 +0000 (09:48 +0000)]
avcodec/bmpenc: return meaningful error code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/truemotion2: use av_reallocp_array() and check return value
Paul B Mahol [Mon, 9 Sep 2013 11:28:54 +0000 (11:28 +0000)]
avcodec/truemotion2: use av_reallocp_array() and check return value

Also reset tok_lens if reallocation fails.

Fixes #2946.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoh264: do not discard NAL_SEI when skipping frames
Rainer Hochecker [Mon, 9 Sep 2013 08:05:48 +0000 (10:05 +0200)]
h264: do not discard NAL_SEI when skipping frames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/ripemd: Add a size optimized version of the transform functions
James Almer [Mon, 9 Sep 2013 08:42:22 +0000 (05:42 -0300)]
lavu/ripemd: Add a size optimized version of the transform functions

When compiling with --enable-small, ripemd.o will weigh a few kilobytes less than
it used to before the previous commit.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/ripemd: Fully unroll the transform function loops
James Almer [Mon, 9 Sep 2013 08:42:21 +0000 (05:42 -0300)]
lavu/ripemd: Fully unroll the transform function loops

crypto_bench RIPEMD-160 results using an AMD Athlon X2 7750+, mingw32-w64 GCC 4.8.1 x86_64

Before:
lavu       RIPEMD-160   size: 1048576  runs:   1024  time:   12.342 +- 0.199

After:
lavu       RIPEMD-160   size: 1048576  runs:   1024  time:   10.143 +- 0.192

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: don't show "Invalid and inefficient vfw-avi..." warning in mpeg4 parser
wm4 [Sun, 8 Sep 2013 22:46:01 +0000 (00:46 +0200)]
lavc: don't show "Invalid and inefficient vfw-avi..." warning in mpeg4 parser

Only the actual decoder should print this warning.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mjpegdec: fix shift_output() with lowres
Michael Niedermayer [Sun, 8 Sep 2013 23:35:34 +0000 (01:35 +0200)]
avcodec/mjpegdec: fix shift_output() with lowres

Fixes Ticket2940

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sun, 8 Sep 2013 21:49:28 +0000 (23:49 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  libxvid: guess a good aspect when we cant store the exact one.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/proresdec2: return meaningful error codes
Paul B Mahol [Sun, 8 Sep 2013 21:24:34 +0000 (21:24 +0000)]
avcodec/proresdec2: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/ratecontrol: give some trivial tips in case of buffer underflows
Michael Niedermayer [Sun, 8 Sep 2013 21:10:41 +0000 (23:10 +0200)]
avcodec/ratecontrol: give some trivial tips in case of buffer underflows

See Ticket2725

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibxvid: guess a good aspect when we cant store the exact one.
Carl Eugen Hoyos [Sun, 8 Sep 2013 20:53:14 +0000 (22:53 +0200)]
libxvid: guess a good aspect when we cant store the exact one.

Based on 394781a8.

6 years agoavcodec/truemotion2: use av_calloc() & av_malloc_array()
Paul B Mahol [Sun, 8 Sep 2013 18:56:06 +0000 (18:56 +0000)]
avcodec/truemotion2: use av_calloc() & av_malloc_array()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/truemotion2: Fix av_freep arguments
Michael Niedermayer [Sun, 8 Sep 2013 18:27:54 +0000 (20:27 +0200)]
avcodec/truemotion2: Fix av_freep arguments

Fixes null pointer dereference
Fixes Ticket2944

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/avidec: fix signedness of pointer type in get_stream_idx()
Michael Niedermayer [Sun, 8 Sep 2013 17:00:59 +0000 (19:00 +0200)]
avformat/avidec: fix signedness of pointer type in get_stream_idx()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/srtdec: fix potential overread.
Clément Bœsch [Sun, 8 Sep 2013 16:28:11 +0000 (18:28 +0200)]
avcodec/srtdec: fix potential overread.

6 years agoavcodec/assenc: fix potential overread.
Clément Bœsch [Sun, 8 Sep 2013 16:23:44 +0000 (18:23 +0200)]
avcodec/assenc: fix potential overread.

6 years agoavformat/subtitles: support standalone CR (MacOS).
Clément Bœsch [Sun, 8 Sep 2013 16:05:11 +0000 (18:05 +0200)]
avformat/subtitles: support standalone CR (MacOS).

Recent .srt files with CR only were found in the wild.

6 years agoavformat/subtitles: add a next line jumper and use it.
Clément Bœsch [Sun, 8 Sep 2013 16:02:45 +0000 (18:02 +0200)]
avformat/subtitles: add a next line jumper and use it.

This fixes a bunch of possible overread in avformat with the idiom p +=
strcspn(p, "\n") + 1 (strcspn() can focus on the trailing '\0' if no
'\n' is found, so the +1 leads to an overread).

Note on lavf/matroskaenc: no extra subtitles.o Makefile dependency is
added because only the header is required for ff_subtitles_next_line().

Note on lavf/mpsubdec: code gets slightly complex to avoid an infinite
loop in the probing since there is no more forced increment.

6 years agoavformat/srtdec: skip initial random line breaks.
Clément Bœsch [Sun, 8 Sep 2013 14:17:46 +0000 (16:17 +0200)]
avformat/srtdec: skip initial random line breaks.

I found a bunch of (recent) SRT files in the wild with 3 to 10 line
breaks at the beginning.

6 years agoavcodec/png: remove obsolete comments
Paul B Mahol [Sun, 8 Sep 2013 15:13:33 +0000 (15:13 +0000)]
avcodec/png: remove obsolete comments

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoswscale/utils: use memcpy instead of loop in sws_cloneVec()
Michael Niedermayer [Sun, 8 Sep 2013 12:57:07 +0000 (14:57 +0200)]
swscale/utils: use memcpy instead of loop in sws_cloneVec()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/matroskaenc: remove bogus prores tag
Paul B Mahol [Sun, 8 Sep 2013 12:35:31 +0000 (12:35 +0000)]
avformat/matroskaenc: remove bogus prores tag

Fixes: ffmpeg -i input -c:v prores output.mkv

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavd/v4l2: Improve debug message
Giorgio Vazzana [Sun, 8 Sep 2013 08:32:48 +0000 (10:32 +0200)]
lavd/v4l2: Improve debug message

In particular, print the standard supported by the selected input.
Additionally, use PRIx64 everywhere when printing standards.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_psnr: refactor subsampled format support
Paul B Mahol [Sun, 8 Sep 2013 10:53:55 +0000 (10:53 +0000)]
avfilter/vf_psnr: refactor subsampled format support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavformat/subtitles: binary search seeking.
Clément Bœsch [Sun, 8 Sep 2013 10:36:57 +0000 (12:36 +0200)]
avformat/subtitles: binary search seeking.

6 years agoavformat/subtitles: check lower bound for duration overlap seeking.
Clément Bœsch [Sun, 8 Sep 2013 07:55:02 +0000 (09:55 +0200)]
avformat/subtitles: check lower bound for duration overlap seeking.

6 years agoavformat/vobsub: fix seeking.
Clément Bœsch [Sun, 8 Sep 2013 07:43:53 +0000 (09:43 +0200)]
avformat/vobsub: fix seeking.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 8 Sep 2013 10:14:33 +0000 (12:14 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavf: fix the comparison in an overflow check

Conflicts:
libavformat/utils.c

See: a5d67bc796e1f9a2b99b43ea807166b655e4bdbc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7ee191cab0dc44700f26c5784e2adeb6a779651b'
Michael Niedermayer [Sun, 8 Sep 2013 09:46:18 +0000 (11:46 +0200)]
Merge commit '7ee191cab0dc44700f26c5784e2adeb6a779651b'

* commit '7ee191cab0dc44700f26c5784e2adeb6a779651b':
  dv: Add a guard to not overread the ppcm array

See: 3669915e93b3df63034857534245c3f2575d78ff
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agooMerge commit '85ac12587bfef970d0e0e4abc292df346daf8478'
Michael Niedermayer [Sun, 8 Sep 2013 09:40:45 +0000 (11:40 +0200)]
oMerge commit '85ac12587bfef970d0e0e4abc292df346daf8478'

* commit '85ac12587bfef970d0e0e4abc292df346daf8478':
  nuv: check ff_rtjpeg_decode_frame_yuv420 return value

Conflicts:
libavcodec/nuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc: add *install-doc that covers all documentation
James Almer [Fri, 6 Sep 2013 04:10:48 +0000 (01:10 -0300)]
doc: add *install-doc that covers all documentation

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/snowenc: fix constness of the AVFrame argument in encode_frame()
Michael Niedermayer [Sun, 8 Sep 2013 03:17:34 +0000 (05:17 +0200)]
avcodec/snowenc: fix constness of the AVFrame argument in encode_frame()

Some fields of the frame are changed to reflect encoder decissions like
if its a keyframe. It thus cannot be constant.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_histeq: remove unused item from filter private context
Paul B Mahol [Sat, 7 Sep 2013 21:04:12 +0000 (21:04 +0000)]
avfilter/vf_histeq: remove unused item from filter private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agovformat/tee: fix uninitialized use of ret
Michael Niedermayer [Sat, 7 Sep 2013 20:16:26 +0000 (22:16 +0200)]
vformat/tee: fix uninitialized use of ret

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_format: add .get_video_buffer back
Paul B Mahol [Sat, 7 Sep 2013 20:37:48 +0000 (20:37 +0000)]
avfilter/vf_format: add .get_video_buffer back

Unbreak xyz12 with vflip.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodoc: rename *install-doc to *install-html
James Almer [Fri, 6 Sep 2013 04:08:31 +0000 (01:08 -0300)]
doc: rename *install-doc to *install-html

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc: fix install-doc dependencies
James Almer [Sun, 1 Sep 2013 22:00:06 +0000 (19:00 -0300)]
doc: fix install-doc dependencies

Put it inside its own ifdef conditional.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_rotate: fix 'oh' option description
Paul B Mahol [Sat, 7 Sep 2013 18:34:03 +0000 (18:34 +0000)]
avfilter/vf_rotate: fix 'oh' option description

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavfilter: remove redundant .get_(audio/video)_buffer initializations
Paul B Mahol [Sat, 7 Sep 2013 13:26:11 +0000 (13:26 +0000)]
avfilter: remove redundant .get_(audio/video)_buffer initializations

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavfilter/af_asetnsamples: remove .needs_writable as it is not required
Paul B Mahol [Fri, 6 Sep 2013 22:25:00 +0000 (22:25 +0000)]
avfilter/af_asetnsamples: remove .needs_writable as it is not required

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavf: fix the comparison in an overflow check
Anton Khirnov [Wed, 4 Sep 2013 06:55:08 +0000 (08:55 +0200)]
lavf: fix the comparison in an overflow check

CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agodv: Add a guard to not overread the ppcm array
Luca Barbato [Mon, 5 Aug 2013 20:15:24 +0000 (22:15 +0200)]
dv: Add a guard to not overread the ppcm array

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agonuv: check ff_rtjpeg_decode_frame_yuv420 return value
Luca Barbato [Sun, 11 Aug 2013 18:35:40 +0000 (20:35 +0200)]
nuv: check ff_rtjpeg_decode_frame_yuv420 return value

CC: libav-stable@libav.org
6 years agoavfilter/af_compand: silence "maybe uninitialized" warnings
Michael Niedermayer [Sat, 7 Sep 2013 01:07:34 +0000 (03:07 +0200)]
avfilter/af_compand: silence "maybe uninitialized" warnings

if channels is 0 it actually would be uninitialized, thus an assert with comment is added

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/af_aecho: silence "maybe uninitialized warning"
Michael Niedermayer [Sat, 7 Sep 2013 01:07:34 +0000 (03:07 +0200)]
avfilter/af_aecho: silence "maybe uninitialized warning"

if channels is 0 it actually would be uninitialized, thus an assert with comment is added

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu: provide msvc implementation of attribute_deprecated
Kirill Gavrilov [Fri, 6 Sep 2013 17:32:31 +0000 (21:32 +0400)]
lavu: provide msvc implementation of attribute_deprecated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/telecine: remove bitstream and pal formats
Paul B Mahol [Fri, 6 Sep 2013 18:45:27 +0000 (18:45 +0000)]
lavfi/telecine: remove bitstream and pal formats

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/fieldorder: work with non writtable frames too
Paul B Mahol [Fri, 6 Sep 2013 14:34:28 +0000 (14:34 +0000)]
lavfi/fieldorder: work with non writtable frames too

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/fieldorder: remove pal8 format
Paul B Mahol [Fri, 6 Sep 2013 18:32:25 +0000 (18:32 +0000)]
lavfi/fieldorder: remove pal8 format

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/fieldorder: add timeline support
Paul B Mahol [Fri, 6 Sep 2013 14:07:57 +0000 (14:07 +0000)]
lavfi/fieldorder: add timeline support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/fieldorder: use av_image_fill_linesizes()
Paul B Mahol [Fri, 6 Sep 2013 14:04:48 +0000 (14:04 +0000)]
lavfi/fieldorder: use av_image_fill_linesizes()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 years agoavisynth: K&R formatting cosmetics
Diego Biurrun [Wed, 4 Sep 2013 18:01:59 +0000 (20:01 +0200)]
avisynth: K&R formatting cosmetics

6 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

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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

6 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

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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.

6 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.