virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
33,689 Commits 37 Branches 400 Tags 460 MiB
410c06d2f3
Commit Graph

33689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
410c06d2f3 asf: export encryption information from asf. 
This way user apps can choose to skip such content.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-16 04:41:11 +02:00
Michael Niedermayer
2822361ed1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  prores: get correct size for coded V plane if alpha is present
  prores: do not set pixel format on codec init
  pthread: prevent updating AVCodecContext from itself in frame_thread_free
  pthread: copy coded frame dimensions in update_context_from_thread
  vp8: prevent read from uninitialized memory in decode_mvs
  vp8: force reallocation in update_thread_context after frame size change
  vp8: fix return value if update_dimensions fails
  matroskadec: fix out of bounds write
  adpcmdec: calculate actual number of output samples for each decoder.
  adpcmdec: check remaining buffer size before decoding next block in the ADPCM IMA WAV decoder.
  adpcmdec: do not terminate early in ADPCM IMA Duck DK3 decoder.
  adpcmdec: remove unneeded buf_size==0 check.
  adpcmdec: remove unneeded zeroing of *data_size
  dnxhdenc: fixed signed multiplication overflow

Conflicts:
	tests/ref/fate/prores-alpha
	tests/ref/fate/truemotion1-24

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-16 04:02:09 +02:00
Michael Niedermayer
647ec6fc03 bit: require at least 1 frame for probing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-16 02:43:36 +02:00
Michael Niedermayer
658c5209fb idf: Improve idf_probe() so it doesnt succeed on 0 byte input 2011-10-16 02:38:02 +02:00
JULIAN GARDNER
3e01c9b547 dvbsubdec: cosmetic change on how xpos is passed around 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-16 02:06:31 +02:00
Stefano Sabatini
bca8bd99d0 af_ashowinfo: fix plane size computation for planar layout formats 
+10l.
 2011-10-16 01:58:31 +02:00
Stefano Sabatini
22137bb5c2 af_aresample: fix properties setting in the output buffer 
In particular: set output timebase to 1/output_sample_rate, fix output
PTS computation, and do not forget to copy properties values from the
input buffer.
 2011-10-16 00:52:23 +02:00
Stefano Sabatini
cc6b8c4b61 af_ashowinfo: adopt used plane size when computing the plane checksum 
Fix checksum computation when the used plane size is different from the
allocated plane size, as it was wrongly assumed.
 2011-10-16 00:51:36 +02:00
Michael Niedermayer
7d2e4673b1 dvbsubdec: Fix 0xf0 end detection 
Based on a change by JULIAN GARDNER

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-15 21:28:43 +02:00
JULIAN GARDNER
294ea2cfc6 dvbsub: add comments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-15 20:30:54 +02:00
JULIAN GARDNER
8a6799d205 dvbsub: add dvb_encode_rle8() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-15 20:30:18 +02:00
JULIAN GARDNER
7fa1f02ce2 dvbsub: Move setting of *dvb_encode_rle() up 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-15 20:28:51 +02:00
JULIAN GARDNER
d5f4857a73 dvbsubdec:dvbsub_display_end_segment() move main loop under if() as its useless if false. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-15 20:16:31 +02:00
Carl Eugen Hoyos
5a563c6319 Support H264 from QNAP Systems. 2011-10-15 18:28:32 +02:00
Mans Rullgard
91038cdbd1 prores: get correct size for coded V plane if alpha is present 
The size check must be updated to take into account both manners
in which v_data_size might be set.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-10-15 14:59:44 +01:00
Mans Rullgard
cd14e297e6 prores: do not set pixel format on codec init 
The pixel format is not known until the frame header is parsed.
Guessing it here only causes trouble for the caller if the guess
turns out to be wrong (and actually causes very wrong output by
avconv/avplay).

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-10-15 14:59:44 +01:00
Michael Niedermayer
2ed7e353bd h264: Workaround invalid flag combinations of 8x8 inference. 
Fixes Ticket555

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-15 15:38:10 +02:00
Stefano Sabatini
1d0afec8fc ffprobe: add AVClass to writers 
It is useful for logging messages from a writer context.
 2011-10-15 00:54:22 +02:00
Ronald S. Bultje
7b6883898f pthread: prevent updating AVCodecContext from itself in frame_thread_free 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-15 00:13:21 +02:00
Ronald S. Bultje
feadcd1bdc pthread: copy coded frame dimensions in update_context_from_thread 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-15 00:13:21 +02:00
Ronald S. Bultje
0f0b5d6434 vp8: prevent read from uninitialized memory in decode_mvs 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-15 00:13:21 +02:00
Ronald S. Bultje
5653579381 vp8: force reallocation in update_thread_context after frame size change 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-15 00:13:21 +02:00
Ronald S. Bultje
f05c2fb6eb vp8: fix return value if update_dimensions fails 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-15 00:13:21 +02:00
Ronald S. Bultje
723229c11f matroskadec: fix out of bounds write 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-15 00:13:21 +02:00
Michael Niedermayer
bd4ebbbbed Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  proresdsp: fix function prototypes.
  prores-idct: fix overflow in c code.
  fate: update prores-alpha ref after changing pix_fmt to yuv444p10le
  prores: add missing feature warning for alpha
  mov: 10l: Terminate string with 0 not '0'
  mov: Prevent illegal writes when chapter titles are very short.
  prores: add appropriate -fix_fmt parameter to FATE command
  riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header
  lavc: add a flag-based error_recognition field to AVCodecContext and deprecate non-flag-based ER field
  lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ER

Conflicts:
	libavcodec/avcodec.h
	libavformat/mov.c
	tests/fate/prores.mak
	tests/ref/acodec/g726
	tests/ref/fate/prores-alpha

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 22:24:00 +02:00
Justin Ruggles
a62c0f94ee adpcmdec: calculate actual number of output samples for each decoder. 
This also allows for removing some of the buf_size checks and using the
sample count for some of the decoding loops.
 2011-10-14 15:53:41 -04:00
Justin Ruggles
439998e18b adpcmdec: check remaining buffer size before decoding next block in the 
ADPCM IMA WAV decoder.
 2011-10-14 15:53:41 -04:00
Justin Ruggles
ff5790c761 adpcmdec: do not terminate early in ADPCM IMA Duck DK3 decoder. 
There are still 2 nibbles to decode once the last byte in the packet has been
read. Updated FATE reference.
 2011-10-14 15:53:41 -04:00
Justin Ruggles
8140a1288f adpcmdec: remove unneeded buf_size==0 check. 
This is already done by avcodec_decode_audio3()
 2011-10-14 15:53:41 -04:00
Justin Ruggles
f7f7c1942b adpcmdec: remove unneeded zeroing of *data_size 2011-10-14 15:53:40 -04:00
Mans Rullgard
d341d5fd2c dnxhdenc: fixed signed multiplication overflow 
The low 32 bits of a multiplication are the same for signed
and unsigned operands.  Casting to unsigned before multiplying
is thus equivalent while avoiding signed overflow, which is
undefined by the C99 standard.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-10-14 20:45:22 +01:00
Michael Niedermayer
4b9e9a57ee proresdec: rename to avoid confusion 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 21:45:14 +02:00
Ronald S. Bultje
05c8f119cc proresdsp: fix function prototypes. 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-14 21:34:46 +02:00
Ronald S. Bultje
f78cd0c243 prores-idct: fix overflow in c code. 
Fix the fate ref for prores-422_proxy by reverting the changes to it
in commit f492df0927

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-14 21:34:20 +02:00
Janne Grunau
8aa80ec5e3 fate: update prores-alpha ref after changing pix_fmt to yuv444p10le 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-14 21:33:01 +02:00
Janne Grunau
19ec283f49 prores: add missing feature warning for alpha 2011-10-14 21:07:53 +02:00
JULIAN GARDNER
0f8d77199a dvbsubdec: add version checking 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:20:00 +02:00
JULIAN GARDNER
1fc7b0ed5a dvbsubdec: handle mode change page state 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:19:59 +02:00
JULIAN GARDNER
168a5d3b3c dvbsubdec: change the top_bottom correction 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:19:59 +02:00
JULIAN GARDNER
f12c7ad86d dvbsubdec: fix buf ptr in dvbsub_parse_region_segment() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:19:59 +02:00
JULIAN GARDNER
7e0f4f9d0f dvbsubdec: bottom_field_len fix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:19:59 +02:00
JULIAN GARDNER
55f17d3175 dvbsubdec: fix x/y_pos checks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:19:59 +02:00
JULIAN GARDNER
24fb1b64a6 dvbsubdec: outcomment debug stuff in dvbsub_parse_pixel_data_block() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:19:59 +02:00
JULIAN GARDNER
b522d2a3b7 dvbsubdec: dirty handkling 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:19:59 +02:00
JULIAN GARDNER
eea064aea6 dvbsubdec: Fix variable increments & checking in dvbsub_read_*bit_string() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 20:12:40 +02:00
Michael Niedermayer
337496980e prores: use C idct for fate as the SSE code is not matching the SSE* code down at the bits 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 19:48:41 +02:00
Alex Converse
7ad06beb2c mov: 10l: Terminate string with 0 not '0' 2011-10-14 10:38:42 -07:00
Alex Converse
8fb22c3d47 mov: Prevent illegal writes when chapter titles are very short. 2011-10-14 10:36:18 -07:00
Diego Biurrun
f492df0927 prores: add appropriate -fix_fmt parameter to FATE command 
Also correct CRCs for Sequence_1-Apple_ProRes_422_Proxy.mov, previous
CRCs were generated with the non-bitexact x86_64 assembler IDCT.
 2011-10-14 18:17:34 +02:00
Michael Niedermayer
530d8529d0 fate: enable the prores tests 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-14 14:08:28 +02:00