x/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-08-05 13:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,098 Commits 40 Branches 430 Tags
da43980fa5a3d4a7240bcb7ae0a458bef3379fa9
Commit Graph
15271 Commits
Author SHA1 Message Date
Mohamed Naufal BasheerandMichael Niedermayer da43980fa5 Add G.723.1 decoder data tables 2011-09-29 21:44:03 +02:00
Mohamed Naufal BasheerandMichael Niedermayer a82c6238ae Add dot_product function for use by the G.723.1 decoder 2011-09-29 21:44:03 +02:00
Mohamed Naufal BasheerandMichael Niedermayer bcc67dffa0 Add a shift parameter to celp_lp_synthesis_filter for reuse by the G.723.1 decoder 2011-09-29 21:43:52 +02:00
Laurent AimarandMichael Niedermayer b4483a531a Check for unsupported parameters in ff_j2k_dwt_init() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-29 06:11:18 +02:00
Laurent AimarandMichael Niedermayer 02660a8713 Check for out of bound reads in jpeg 2000 decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-29 06:11:18 +02:00
Laurent AimarandMichael Niedermayer 41b7389cad Prevent calling init_vlc() with invalid parameters in motionpixels decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-29 06:11:18 +02:00
Laurent AimarandMichael Niedermayer 56ee5a9ad1 Prevent NULL dereference when the palette is missing in the xan decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-29 06:11:18 +02:00
Laurent AimarandMichael Niedermayer 5279141c1d Fixed out of bound accesses in xan_unpack() of the xan decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-29 06:11:18 +02:00
Michael Niedermayer f9a2d0c3fe Merge remote-tracking branch 'qatar/master' 
* qatar/master: (23 commits)
  avconv: Reformat s16 volume adjustment.
  ARM: NEON optimised vector_fmac_scalar()
  dca: use vector_fmac_scalar from dsputil
  dsputil: add vector_fmac_scalar()
  latmenc: Fix private options
  vf_unsharp: store hsub/vsub in the filter context
  vf_unsharp: adopt a more natural order of params in apply_unsharp()
  vf_unsharp: rename method "unsharpen" to "apply_unsharp"
  vf_scale: apply the same transform to the aspect during init that is applied per frame
  vf_pad: fix "vsub" variable value computation
  vf_scale: add a "sar" variable
  lavfi: fix realloc size computation in avfilter_add_format()
  vsrc_color: use internal timebase
  lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()
  graphparser: prefer void * over AVClass * for log contexts
  avfiltergraph: use meaningful error codes
  avconv: Initialize return value for codec copy path.
  fate: use 'run' helper for seek-test
  fate: remove seek-mpeg2reuse test
  Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080.
  ...

Conflicts:
	doc/filters.texi
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.c
	libavfilter/avfiltergraph.h
	libavfilter/graphparser.c
	libavfilter/vf_scale.c
	libavfilter/vsrc_color.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-29 01:11:01 +02:00
Michael Niedermayer 237d31e0b9 h264: fix FIXME and use list_count in ff_h264_fill_mbaff_ref_list() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 22:28:47 +02:00
Michael Niedermayer dc9ce40069 h264: More correct ref_count check in decode_slice_header() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 22:28:47 +02:00
Carl Eugen Hoyos 75f26a6f0b Use "JPEG 2000" as long name for j2k. 2011-09-28 18:43:49 +02:00
Nicolas GeorgeandMichael Niedermayer 769298a686 libvpxenc: Replace av_realloc by av_realloc_f when relevant. 
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 18:13:52 +02:00
Nicolas GeorgeandMichael Niedermayer 198ed6474d bitstream: Replace av_realloc by av_realloc_f when relevant. 
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 18:13:52 +02:00
Michael Niedermayer e89f58810d libx264: remove check_default_settings() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 18:13:52 +02:00
Mans Rullgard baf6b738f2 ARM: NEON optimised vector_fmac_scalar() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-09-28 15:56:09 +01:00
Mans Rullgard a92a1b93b4 dca: use vector_fmac_scalar from dsputil 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-09-28 15:56:09 +01:00
Mans Rullgard fcca826a63 dsputil: add vector_fmac_scalar() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-09-28 15:56:08 +01:00
Nicolas GeorgeandMichael Niedermayer 6d98e2db35 j2kdec: use correct printf format. 
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 16:11:01 +02:00
Michael Niedermayer 7393b41744 j2kenc: Fix pointer<->integer casts. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 15:25:04 +02:00
Michael Niedermayer 5a6e7771ed h264: dont set key_frame when the frame is not a real keyframe. 
Fixes Ticket514

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 03:47:39 +02:00
Laurent AimarandMichael Niedermayer 1f024b8820 Check for out of bound reads in the flic decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 02:59:28 +02:00
Laurent AimarandMichael Niedermayer feca3ba053 Prevent out of bound accesses in the xan decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 01:04:52 +02:00
Laurent AimarandMichael Niedermayer b9596a5037 Check for invalid/corrupted bitstream in sun raster decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 00:52:37 +02:00
Laurent AimarandMichael Niedermayer 19e95b8845 Prevent NULL dereferences when missing the reference frame in the xan decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 00:49:25 +02:00
Laurent AimarandMichael Niedermayer 039f3c33ff Check for out of bounds reads in sun rasterfile decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 00:24:51 +02:00
Laurent AimarandMichael Niedermayer 61930119cb Check for corrupted extra data in wmavoice decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 00:20:04 +02:00
Laurent AimarandMichael Niedermayer e09ae22ab7 Check for out of bound writes in the wmavoice decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-28 00:18:38 +02:00
Laurent AimarandMichael Niedermayer 66aae97a60 Prevent NULL dereferences when missing the reference frame in the bink decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 23:45:37 +02:00
Michael Niedermayer 2fbf691038 j2kenc: Fix use of value before its initialized. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 21:32:39 +02:00
Michael Niedermayer 398b5327a3 j2kenc: only list pixel formats that fully work currently. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 21:32:39 +02:00
Michael Niedermayer 2214a67de5 j2kenc: fix colors on yuv444 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 21:32:39 +02:00
Michael Niedermayer 34ac8ec2ea j2kenc: enable 4:2:0 YUV it works as "well" as the other subsampled yuv formats 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 19:30:19 +02:00
Michael Niedermayer c4b269c5c6 build system: enable j2kenc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 19:30:19 +02:00
Michael Niedermayer e6aed5f404 j2kenc: fix coded_frame and prevent null pointer dereference. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 19:30:19 +02:00
Michael Niedermayer 40923e1567 j2kenc: Update ff_j2k_init_component() arguments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 19:30:19 +02:00
Michael Niedermayer 2f16b6a525 j2kenc: fix arguments for ff_j2k_getnbctxno() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 19:30:19 +02:00
Michael Niedermayer 0db973e0d7 j2kenc: mark as experimental. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 19:30:19 +02:00
Michael Niedermayer 1c20a0b354 j2kenc: s/CODEC_TYPE_VIDEO/AVMEDIA_TYPE_VIDEO/ 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 19:30:18 +02:00
Michael Niedermayer de89bc994c j2kenc: update codec name to modern ffmpeg 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 19:30:18 +02:00
Michael Niedermayer 1e086fd730 j2kenc: cleanup() is not used outside thus it is static 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 19:30:18 +02:00
Michael Niedermayer c153c00367 j2kenc: update function name. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 19:30:18 +02:00
Laurent AimarandMichael Niedermayer 254af56dd1 Check for out of bound writes when building tree in bink decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 15:15:54 +02:00
Laurent AimarandMichael Niedermayer 36bf135d4c Check for various out of bound writes in the bink decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 15:15:54 +02:00
Michael Niedermayer 7c1aba4f01 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (21 commits)
  fate: allow testing with libavfilter disabled
  x86: XOP/FMA4 CPU detection support
  ws_snd: misc cosmetic clean-ups
  ws_snd: remove the 2-bit ADPCM table and just subtract 2 instead.
  ws_snd: use memcpy() and memset() instead of loops
  ws_snd: use samples pointer for loop termination instead of a separate iterator variable.
  ws_snd: make sure number of channels is 1
  ws_snd: add some checks to prevent buffer overread or overwrite.
  ws_snd: decode to AV_SAMPLE_FMT_U8 instead of S16.
  flacdec: fix buffer size checking in get_metadata_size()
  rtp: Simplify ff_rtp_get_payload_type
  rtpenc: Add a payload type private option
  rtp: Correct ff_rtp_get_payload_type documentation
  avconv: replace all fprintf() by av_log().
  avconv: change av_log verbosity from ERROR to FATAL for fatal errors.
  cmdutils: replace fprintf() by av_log()
  avtools: parse loglevel before all the other options.
  oggdec: add support for Xiph's CELT codec
  sol: return error if av_get_packet() fails.
  cosmetics: reindent and pretty-print
  ...

Conflicts:
	avconv.c
	cmdutils.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/oggparsecelt.c
	libavformat/utils.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 02:14:37 +02:00
Laurent AimarandMichael Niedermayer c2a016ad4d Reset internal state on corrupted blocks in wavpack decoder. 
wavpack_decode_block() supposes that it is called back with the exact
same buffer unless it has returned with an error. With multi-channels
files, wavpack_decode_frame() was breaking this assumption.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 01:07:58 +02:00
Laurent AimarandMichael Niedermayer fc64434030 Validate the number of audio channels before using it in wmapro decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-27 01:07:58 +02:00
Justin Ruggles 3d371f417e ws_snd: misc cosmetic clean-ups 2011-09-26 16:23:58 -04:00
Justin Ruggles 659c719bc7 ws_snd: remove the 2-bit ADPCM table and just subtract 2 instead. 2011-09-26 16:23:15 -04:00
Justin Ruggles 618b067d21 ws_snd: use memcpy() and memset() instead of loops 2011-09-26 16:23:14 -04:00