RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
35,241 Commits 37 Branches 400 Tags 265 MiB
Commit Graph

35241 Commits

Author SHA1 Message Date
Mans Rullgard 3bd1162a52 gif: fix invalid signed shifts 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-11-26 11:38:40 +00:00
Stefano Sabatini 28338bc2a3 lavfi: add libass based subtitles renderer 2011-11-26 10:42:33 +01:00
Reimar Döffinger 7fb55e0b02 rtjpeg: simplify get_block() by using get_bits_left. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-11-26 08:40:51 +01:00
Reimar Döffinger 7a62ddb689 rtjpeg: check get_block return value for error. 
This avoids crashes due to reading out-of-bounds.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-11-26 08:39:58 +01:00
Reimar Döffinger f6afacdb3b nuv: check per-frame header for validity. 
Since it contains dimensions parsing an invalid one has rather
annoying effects.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-11-26 08:38:59 +01:00
Reimar Döffinger 785baa738a nuv: use FFALIGN. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-11-26 08:38:14 +01:00
Carl Eugen Hoyos 1484b5dec5 flicvideo: check extradata_size before accessing extradata. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-11-26 08:36:16 +01:00
Michael Niedermayer 5ace144fe0 fraps: check for overread. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-11-26 08:35:57 +01:00
K.Y.H 51f316a997 cook: fix apparent typo in extradata parsing 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-11-26 08:33:31 +01:00
Anton Khirnov 488eec1044 lavc: update doxy to use nondeprecated API. 2011-11-26 08:26:24 +01:00
Michael Niedermayer 31a1342e7a swscale: remove duplicate code from yesterdays merge. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-26 01:26:24 +01:00
Michael Niedermayer 022f8d27dd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  swscale: Readd #define _SVID_SOURCE
  Fix av_get_channel_layout_string() for positions >31
  configure: Store vda lib flags in extralibs instead of ldflags
  Make channel layout masks unsigned
  dca: ARMv6 optimised decode_blockcode()
  nullenc: drop AVFMT_RAWPICTURE from the flags
  frame-mt: return consumed packet size in ff_thread_decode_frame
  aacdec: add more fate tests covering SBR and PS
  MK(BE)TAG: avoid undefined shifts

Conflicts:
	configure
	libavcodec/arm/dca.h
	libavcodec/dca.c
	libavcodec/mlp_parser.c
	libavcodec/version.h
	libavfilter/asrc_anullsrc.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/defaults.c
	libavutil/audioconvert.c
	libavutil/avutil.h
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-26 01:12:08 +01:00
Stefano Sabatini a11eeb9215 configure: sort entries 2011-11-26 00:56:01 +01:00
Michael Niedermayer fc75e6f168 vc1dec: fix scantable for advanced P frames 
Fixes: vc1 file from Ticket606
Fixes: vc1+vc1+++artifacts*.vc1
Fixes: mpeg+vc1+++salxxos.evo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-25 23:44:39 +01:00
Michael Niedermayer a3b3562b47 vc1dec: fix 10l typo 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-25 22:46:17 +01:00
Michael Niedermayer 9e794d103c vc1dec: drop damaged B frames 
Fixes: vc1_error_spilt.avi of Ticket606

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-25 20:55:25 +01:00
Michael Niedermayer 7d52f46db7 vc1dec: fix used ER flags in vc1_decode_b_blocks() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-25 20:54:57 +01:00
Martin Storsjö f32dfad9dc swscale: Readd #define _SVID_SOURCE 
This was removed erroneously in
046f081b46. This define still is
necessary for getting MAP_ANONYMOUS defined on linux/glibc,
despite the define reshuffling done in that commit.

Without MAP_ANONYMOUS defined, the mprotect calls for setting the
generated mmx2 scaler code pages executable are left out, causing
crashes if that codepath is chosen.

This patch fixes scaling from 192x144 to 320x240 with
-sws_flags fast_bilinear, which crashes on linux at the
moment.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-11-25 19:59:15 +02:00
Michael Niedermayer 1afe49b062 indeo3: out of array read checks for decode_plane() 
Fixes: avi+indeo3+++1-dog.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-25 18:04:17 +01:00
Michael Niedermayer e9e642cbfb indeo3: Check remaining bits in parse_bintree() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-25 17:55:23 +01:00
Anatoly Nenashev a7cfef2994 H264: Check if more RBSP data in PPS provided by current profile due to Annex A. 
This patch also fix issue https://ffmpeg.org/trac/ffmpeg/ticket/685.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-25 17:10:47 +01:00
Mans Rullgard 019dd23657 Fix av_get_channel_layout_string() for positions >31 
A value shifted left by >31 needs to have a 64-bit type.
As there are no defined channels in this range, the fix
is purely theoretical at this point, although it does
avoid some invalid shifts triggering the overflow
checker.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-11-25 15:19:55 +00:00
Michael Niedermayer e1d48786d5 ffmpeg: Warn if output file is empty 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-25 16:17:06 +01:00
Rafaël Carré be1e872582 configure: Store vda lib flags in extralibs instead of ldflags 
This way the needed linking flags end up in libavcodec.pc.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-11-25 15:52:55 +02:00
Dominique Leuenberger 12d276531c RELEASE: We're now at 0.8.7.git 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-25 14:37:35 +01:00
Mans Rullgard cc276c85d1 Make channel layout masks unsigned 
It makes more sense for a bit mask to use an unsigned type.
The change should be source and binary compatible on all
supported systems, hence micro version bump.

Fixes a few invalid shifts.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-11-25 13:19:54 +00:00
Mans Rullgard 00a856e3f9 dca: ARMv6 optimised decode_blockcode() 
This is a hand-tuned version of the code with impossible parts of
the FASTDIV function ommitted.

2-5% faster overall on Cortex-A8.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-11-25 13:19:53 +00:00
Stefano Sabatini 65f24858ed ffprobe: always print int values with print_val() 
In particular, make the json writer write size values, fix regression
introduced with the addition of the print_val() macro.
 2011-11-25 13:25:56 +01:00
Luca Barbato 035af998ad nullenc: drop AVFMT_RAWPICTURE from the flags 
This makes the two pass encoding with x264 working with -f null - as
first pass.
 2011-11-25 13:16:01 +01:00
Janne Grunau 117e2a30f2 frame-mt: return consumed packet size in ff_thread_decode_frame 
This is required to fulfill avcodec_decode_video2() promise to return
the number of consumed bytes on success.
 2011-11-25 08:25:12 +01:00
Janne Grunau d14d4d982c aacdec: add more fate tests covering SBR and PS 
Add all seven test bitstreams of Coding Technologies "aacPlus Decoder
Check Package". The streams cover different ways to signal SBR and PS
in different formats.
 2011-11-25 08:25:12 +01:00
Michael Niedermayer 6d16a96a95 vf_boxblur: fix memleak 
As the filter uses the default start frame, the cleanup done by the
default end frame is needed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-25 04:45:41 +01:00
Michael Niedermayer 92afb43162 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  snow: split snow in snowdec and snowenc
  tiffenc: deprecate using compression_level
  swscale: fix failing fate tests.
  swscale: add support for planar RGB input.
  h264: add support for decoding planar RGB images.
  Clean up swscale pixfmt macros using av_pix_fmt_descriptors[].
  pixfmt: add planar RGB formats.

Conflicts:
	libavcodec/h264.c
	libavcodec/snow.c
	libavcodec/utils.c
	libavutil/avutil.h
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-25 04:34:44 +01:00
Mans Rullgard 6b34fbba9b MK(BE)TAG: avoid undefined shifts 
Casting the left-most byte to unsigned avoids an undefined
result of the shift by 24 if bit 7 is set.  This affects
the rm demuxer.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-11-25 00:20:03 +00:00
Carl Eugen Hoyos 3880b4541a Do not claim that every unknown rm stream is a video stream. 
Also reduce verbosity for the unsupported stream message, use
an AVFormatContext for av_log and and print the tag of the
unknown stream.

Improves ticket #672.
 2011-11-25 00:06:19 +01:00
Michael Niedermayer e421b79d01 indeo3: fix null pointer dereference in vulnerable.mov 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-24 22:39:23 +01:00
Alex Zhukov eb511ef636 yuv pixel formats support in openjpeg decoder + 10bit support 
Signed-off-by: Alex Zhukov <zhukov.alex@gmail.com>
Reviewed-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-24 21:51:15 +01:00
Carl Eugen Hoyos 0a4f02117b Add option -n to exit if output file exists. 2011-11-24 21:42:42 +01:00
Luca Barbato 7f1b427018 snow: split snow in snowdec and snowenc 
The common non inlined code goes in snow.c, the common inlined code in
snow.h, tables move in snowdata.h (included only by snow.c)
 2011-11-24 21:35:47 +01:00
Anton Khirnov 8b7412fe4e tiffenc: deprecate using compression_level 2011-11-24 21:31:36 +01:00
Ronald S. Bultje f7f1835258 swscale: fix failing fate tests. 
isGray() is left as a FIXME for later.
 2011-11-24 12:21:03 -08:00
Ronald S. Bultje 185655c601 swscale: add support for planar RGB input. 2011-11-24 10:40:05 -08:00
Ronald S. Bultje db431f7efe h264: add support for decoding planar RGB images. 2011-11-24 08:25:36 -08:00
Ronald S. Bultje 6b0768e202 Clean up swscale pixfmt macros using av_pix_fmt_descriptors[]. 2011-11-24 08:24:55 -08:00
Ronald S. Bultje bd97b2e1ce pixfmt: add planar RGB formats. 2011-11-24 08:13:50 -08:00
Clément Bœsch 0232f788b6 swr: fix invalid sample format message. 
If the sample format is invalid, av_get_sample_fmt_name() will always
return NULL.
 2011-11-24 16:55:45 +01:00
Clément Bœsch 58205edcc6 swr: use native planar sample formats. 2011-11-24 16:55:45 +01:00
Clément Bœsch 573ffbb3b5 lavu: add av_get_alt_sample_fmt(). 2011-11-24 16:55:45 +01:00
Clément Bœsch afb0470a25 swr: fix test program. 
The number of used channels need to be reset to zero when
swr_alloc_set_opts() is called successive times.

This is a regression introduced in c8136ebd.
 2011-11-24 16:55:44 +01:00
Michael Niedermayer 2bf09826c1 loco: Fix error handling. 
Fixes null pointer dereference / http://www.google-melange.com/gci/task/view/google/gci2011/7120335

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-24 15:39:41 +01:00