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
32,769 Commits 37 Branches 400 Tags 460 MiB
3e1a7ae44a
Commit Graph

80 Commits

Author SHA1 Message Date
Michael Niedermayer
faba79e080 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
  H.264: tweak some other x86 asm for Atom
  probe: Fix insane flow control.
  mpegts: remove invalid error check
  s302m: use nondeprecated audio sample format API
  lavc: use designated initialisers for all codecs.
  x86: cabac: add operand size suffixes missing from 6c32576

Conflicts:
	libavcodec/ac3enc_float.c
	libavcodec/flacenc.c
	libavcodec/frwu.c
	libavcodec/pictordec.c
	libavcodec/qtrleenc.c
	libavcodec/v210enc.c
	libavcodec/wmv2dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-30 06:46:08 +02:00
Anton Khirnov
ec6402b7c5 lavc: use designated initialisers for all codecs. 
It's more readable and less prone to breakage.
 2011-07-29 08:42:34 +02:00
Michael Niedermayer
99eb31e263 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (25 commits)
  Replace custom DEBUG preprocessor trickery by the standard one.
  vorbis: Remove non-compiling debug statement.
  vorbis: Remove pointless DEBUG #ifdef around debug output macros.
  cook: Remove non-compiling debug output.
  Remove pointless #ifdefs around function declarations in a header.
  Replace #ifdef + av_log() combinations by av_dlog().
  Replace custom debug output functions by av_dlog().
  cook: Remove unused debug functions.
  Remove stray extra arguments from av_dlog() invocations.
  targa: fix big-endian build
  v4l2: remove one forgotten use of AVFormatParameters.pix_fmt.
  vfwcap: add a framerate private option.
  v4l2: add a framerate private option.
  libdc1394: add a framerate private option.
  fbdev: add a framerate private option.
  bktr: add a framerate private option.
  oma: check avio_read() return value
  nutdec: remove unused variable
  Remove unused variables
  swscale: allocate larger buffer to handle altivec overreads.
  ...

Conflicts:
	ffmpeg.c
	libavcodec/dca.c
	libavcodec/dirac.c
	libavcodec/error_resilience.c
	libavcodec/h264.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pthread.c
	libavcodec/rv10.c
	libavcodec/s302m.c
	libavcodec/shorten.c
	libavcodec/truemotion2.c
	libavcodec/utils.c
	libavdevice/dv1394.c
	libavdevice/fbdev.c
	libavdevice/libdc1394.c
	libavdevice/v4l2.c
	libavformat/4xm.c
	libavformat/apetag.c
	libavformat/asfdec.c
	libavformat/avidec.c
	libavformat/mmf.c
	libavformat/mpeg.c
	libavformat/mpegenc.c
	libavformat/mpegts.c
	libavformat/oggdec.c
	libavformat/oggparseogm.c
	libavformat/rl2.c
	libavformat/rmdec.c
	libavformat/rpl.c
	libavformat/rtpdec_latm.c
	libavformat/sauce.c
	libavformat/sol.c
	libswscale/utils.c
	tests/ref/vsynth1/error
	tests/ref/vsynth2/error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-03 05:19:30 +02:00
Diego Biurrun
df96f22d8f Replace custom debug output functions by av_dlog(). 2011-06-03 00:44:03 +02:00
Stefano Sabatini
01042d4123 lavc: set defaults in internal codec frames 
This is required specifically for setting frame->format to -1,
otherwise it will be set to 0 = PIX_FMT_YUV420P and code reading
the format from the output decoded frame will get misled.

In particular fix regressions occurring with the pending vsrc_buffer
patch.
 2011-05-07 12:03:59 +02:00
Michael Niedermayer
c40798441f Merge remote branch 'qatar/master' 
* qatar/master:
  ac3dec: fix processing of delta bit allocation information.
  vc1: fix fate-vc1 after previous commit.
  wmv3dec: fix playback of complex WMV3 files using simple_idct.
  make av_dup_packet() more cautious on allocation failures
  make containers pass palette change in AVPacket
  introduce side information for AVPacket

Politic commits that have not been pulled:
  Update regtest checksums after revision 6001dad.
  Replace more FFmpeg references by Libav.
  Replace references to ffmpeg-devel with libav-devel; fix roundup URL.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-17 23:43:54 +02:00
Kostya Shishkov
2d8591c27e make containers pass palette change in AVPacket 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-04-15 18:02:05 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Diego Elio Pettenò
e7e2df27f8 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69)
 2011-01-28 03:15:34 +01:00
Diego Elio Pettenò
d36beb3f69 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-26 16:08:45 +00:00
Daniel Kang
2843502ea4 Check for invalid decode op-codes, fixes issue 2522. 
Patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26295 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-10 10:47:10 +00:00
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands. 
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 14:45:34 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
Kostya Shishkov
da93766858 16-bit Interplay video does not need palette control 
Originally committed as revision 20936 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-27 14:07:21 +00:00
Kostya Shishkov
a69be798dc Add missing opcodes for 16-bit Interplay Video decoding and finally enable it 
Originally committed as revision 20934 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-27 09:12:50 +00:00
Kostya Shishkov
dcfb0cad68 16-bit Interplay Video stores motion vector data at the end of frame, 
so initialize data pointers for 16-bit variant and read motion vectors
as supposed in corresponding opcodes.

Originally committed as revision 20933 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-27 09:03:31 +00:00
Kostya Shishkov
e09cdc7206 10l trocadero: forgot one case where picture linesize should be used 
Originally committed as revision 20932 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-27 08:56:06 +00:00
Kostya Shishkov
5b8ebb3f41 cosmetics: reindent and break long lines after last commits 
Originally committed as revision 20931 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-27 08:53:02 +00:00
Kostya Shishkov
5a8cf39e31 Add 16-bit image data handling (but not decoding yet) to Interplay Video 
Originally committed as revision 20930 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-27 08:49:32 +00:00
Kostya Shishkov
80fec3ffd0 Use frame linesize in Interplay Video block copying function 
Originally committed as revision 20929 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-27 08:38:07 +00:00
Kostya Shishkov
80ca19f766 Make CHECK_STREAM_PTR macro in Interplay Video decoder usable with 
non-default pointers, it will be useful for checking motion values
data in 16-bit variant of this codec.

Originally committed as revision 20928 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-27 08:31:39 +00:00
Kostya Shishkov
8badb23e22 Recognize 16-bit Interplay Video variant 
Originally committed as revision 20927 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-27 08:21:40 +00:00
Kostya Shishkov
9156a5ad72 Change main loop in Interplay Video decoder, so variables x and y really mean 
coordinates, not offsets.

Originally committed as revision 20926 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-27 08:15:19 +00:00
Kostya Shishkov
0fb669ae9e cosmetics: reindent 
Originally committed as revision 20919 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-25 17:13:05 +00:00
Måns Rullgård
3aab27b459 Remove useless #include <unistd.h> from many files 
Originally committed as revision 19499 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-22 23:37:53 +00:00
Reimar Döffinger
6000439ca4 Simplify ipvideo_decode_opcodes by using get_bits, this might be slower 
but is not performance-critical anyway.

Originally committed as revision 18593 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 19:28:36 +00:00
Reimar Döffinger
28ab90edde Remove unused code_counts array from interplavideo.c. 
Originally committed as revision 18592 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 19:21:50 +00:00
Thilo Borgmann
7a00bbad21 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an 
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.

Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.

Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 15:59:50 +00:00
Reimar Döffinger
8514f8427f Fix ipvideo_decode_block_opcode_0xD again. 
Originally committed as revision 18289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-31 22:28:36 +00:00
Reimar Döffinger
dd9630e40f Cosmetics: remove some pointless {} 
Originally committed as revision 18284 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-31 19:39:47 +00:00
Reimar Döffinger
993a442315 Slightly simplify ipvideo_decode_block_opcode_0xD 
Originally committed as revision 18283 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-31 19:36:44 +00:00
Reimar Döffinger
49a20ffabc One more simplification for ipvideo_decode_block_opcode_0xA 
Originally committed as revision 18282 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-31 19:18:13 +00:00
Reimar Döffinger
5e8b83ac3b Slightly simplify first part of ipvideo_decode_block_opcode_0xA, 
hopefully allows for further simplifications in the future.

Originally committed as revision 18280 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-31 18:48:31 +00:00
Reimar Döffinger
283531a81e Make ipvideo_decode_block_opcode_0x8 a lot simpler by decoding the pixels 
in a more natural order.

Originally committed as revision 18277 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-31 18:35:19 +00:00
Reimar Döffinger
4472ad2cc4 Fix a too small CHECK_STREAM_PTR value in interplayvideo.c 
Originally committed as revision 18276 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-31 18:23:52 +00:00
Reimar Döffinger
f02bd7e49c Avoid the last two uses of bitmasks in interplayvideo 
Originally committed as revision 18272 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-31 14:48:14 +00:00
Reimar Döffinger
3f300d7e25 100l, fix FATE test broken by r18264 
Originally committed as revision 18271 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-31 14:44:46 +00:00
Reimar Döffinger
9aaacc246a Reindent 
Originally committed as revision 18270 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-31 14:10:45 +00:00
Reimar Döffinger
1548839e51 Deduplicate code by moving it outside the if/else 
Originally committed as revision 18269 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-31 14:06:22 +00:00
Reimar Döffinger
268a618ba6 Rearrange how the different cases are checked to reduce the number of 
comparisons and allow further simplifications.

Originally committed as revision 18268 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-31 14:04:54 +00:00
Reimar Döffinger
0448b78b97 Avoid "reloading" code by using a 64 bit type for the flags and loading all at once. 
Originally committed as revision 18266 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-31 13:58:40 +00:00
Reimar Döffinger
3766b9e0a8 Remove now pointless temporary pix variables. 
Originally committed as revision 18265 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-31 13:33:55 +00:00
Reimar Döffinger
0312b77ccd Slightly simplify part of ipvideo_decode_block_opcode_0x8 
Originally committed as revision 18264 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-31 13:30:42 +00:00
Reimar Döffinger
51e350284d Fix indentation 
Originally committed as revision 18263 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-31 13:21:41 +00:00
Reimar Döffinger
9be06a0ed1 Avoid code duplication by using ?: and array indexing instead of if..else 
Originally committed as revision 18262 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-31 13:21:10 +00:00
Reimar Döffinger
32eea24e9a Prettify some assignments 
Originally committed as revision 18261 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-31 12:57:03 +00:00
Reimar Döffinger
e3114eb1bb Get rid of some pointless bitmask/shifter variables in interplayvideo.c 
Originally committed as revision 18260 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-31 12:44:35 +00:00
Reimar Döffinger
aadf88119e Merge the 3 COPY_FROM_* macros with lots of duplicated code into a single 
copy_from function.

Originally committed as revision 18225 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-29 18:15:02 +00:00
Reimar Döffinger
a1f6ffd44d Change CHECK_STREAM_PTR macro to correctly handle the (extremely unlikely) 
overflow case.

Originally committed as revision 18224 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-29 17:50:46 +00:00
Reimar Döffinger
3017d8e9d7 Simplify check for leftover bytes after decoding for interplayvideo. 
Originally committed as revision 18223 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-29 17:42:03 +00:00