virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
28,913 Commits 37 Branches 400 Tags 464 MiB
bc6047223f
Commit Graph

424 Commits

Author SHA1 Message Date
Reimar Döffinger
da53f05fd0 Do not offer unsupported HWAccel PIX_FMT. 
Only fixes MPEG-1/MPEG-2 as a first step.
 2011-04-05 18:23:15 +02:00
Reimar Döffinger
735c4f0b84 Use CONFIG_VDPAU as condition for using ff_vdpau_mpeg_picture_complete. 
CONFIG_VDPAU is the condition on which ff_vdpau_mpeg_picture_complete
is compiled in, so it is more appropriate, particularly since the
separate VDPAU decoder should be removed in the longer term.
 2011-04-05 18:23:10 +02:00
Michael Niedermayer
7f125c3e87 Move frame_pred_frame_dct check elsewhere. 
Fixes issue2405
 2011-04-03 16:40:13 +02:00
Michael Niedermayer
f35439699f Merge remote branch 'qatar/master' 
* qatar/master:
  Fixed-point MDCT with 32-bit unscaled output
  lavc: deprecate rate_emu
  lavc: mark hurry_up for removal on next major bump
  parser: mark av_parser_parse() for removal on next major bump
  lavc: add missing audioconvert includes
  jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-03 02:28:01 +02:00
Anton Khirnov
8ed2ae09a2 lavc: mark hurry_up for removal on next major bump 
It has been deprecated for about five years, skip_idct/skip_frame should
be used instead.
 2011-04-02 16:17:24 +02:00
Carl Eugen Hoyos
ecf94986c8 Fix compilation with --disable-vdpau 2011-04-02 00:50:39 +02:00
Reimar Döffinger
9b7a0c5d88 Allow selecting VDPAU, XvMC via get_format for MPEG-2 
To avoid further special-casing, dummy AVHWAccels are added
for VDPAU.
It should be possible to move VDPAU completely to AVHWAccel later.
 2011-04-01 19:13:24 +02:00
Reimar Döffinger
e9ccdae09b Use consistent condition for whether to run slice-threading execute function. 2011-03-28 23:08:07 +02:00
Michael Niedermayer
797ef671dd Merge remote-tracking branch 'newdev/master' 
* newdev/master:
  matroskadec: set default duration for simple block
  When building for MinGW32 disable strict ANSI compliancy.
  ARM: fix ff_apply_window_int16_neon() prototype
  configure: check for --as-needed support early
  ARM: NEON optimised apply_window_int16()
  ac3enc: NEON optimised shift functions
  ac3enc: NEON optimised ac3_max_msb_abs_int16 and ac3_exponent_min
  mpeg12.c: fix slice threading for mpeg2 field picture mode.
  ffmetadec.c: fix compiler warnings.
  configure: Don't explicitly disable ffplay or in/outdevices on dos
  configure: Remove the explicit disabling of ffserver
  configure: Add fork as a dependency to ffserver

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-25 02:57:41 +01:00
Michael Niedermayer
628724b61d More advanced ffmpeg mpeg2 aspect guessing code. 
Fixes issue1613, 621, 562 simultaneously

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-25 01:45:47 +01:00
Ronald S. Bultje
f711424969 mpeg12.c: fix slice threading for mpeg2 field picture mode. 
Fixes "make THREADS=2 fate-mpeg2-field-enc".
 2011-03-24 12:16:22 -04:00
Michael Niedermayer
d375c10400 Fake-Merge remote-tracking branch 'ffmpeg-mt/master' 2011-03-22 22:36:57 +01: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
Benjamin Larsson
aecd0a4496 Export profiles from the mpeg2 video decoder 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-10 18:05:35 -05:00
Luca Barbato
dfd2a005eb Replace dprintf with av_dlog 
dprintf clashes with POSIX.1-2008
 2011-01-29 23:55:37 +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
Mans Rullgard
f162e988aa Remove redundant checks against MIN_CACHE_BITS 
With the removal of the libmpeg2 bitstream reader, MIN_CACHE_BITS
is always >= 25, so tests against smaller values can be removed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-23 16:41:04 +00:00
Vitor Sessak
6e16398aa3 Make dc_lum_vlc and dc_chroma_vlc non-static symbols, 
this fixed the decoding of version 3 PSX MDEC files.

Originally committed as revision 26230 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 19:38:42 +00:00
Michael Niedermayer
a20df85886 Fix doxy that refers to the wrong variable. 
Originally committed as revision 24549 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-27 15:54:26 +00:00
Carl Eugen Hoyos
0fd0ef7947 Add new decoder property max_lowres and do not init decoder if requested value is higher. 
Originally committed as revision 24098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-07 21:23:36 +00:00
Daniel Kristjansson
0db2d3cf1d Do not skip one of three bits zero padding. 
Patch by Daniel Kristjansson, danielk cuymedia net

Originally committed as revision 23914 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-30 21:46:03 +00:00
Måns Rullgård
49bd8e4b84 Fix grammar errors in documentation 
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-30 15:38:06 +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
Michael Niedermayer
fc4a2d1e8c Change ref_index structure so it matches how its organized in h264. 
Also revert the related error concealment hotfix.

Originally committed as revision 22640 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-23 02:17:04 +00:00
Michael Niedermayer
53f66cee0c Add ff_ prefix for mpeg2_dc_scale_table. 
Originally committed as revision 22556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 22:49:46 +00:00
Michael Niedermayer
acbb378d1d Fix timestamp association for mpeg2 field pictures. 
Fixes /MPlayer/incoming/codec_copy_fails_vob_to_mpeg-ts/codec_copy_fails_vob_to_mpeg-ts.vob

Originally committed as revision 21949 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 23:22:51 +00:00
Carl Eugen Hoyos
b52fcba9cd Fix decoding ATI VCR2 codec, sample in 
samples/V-codecs/ATI-VCR12/ATI/VCR2test.avi
Software decoding was broken since r8865, when two new context variables
were added, but not initialized in vcr2_init_sequence().
Another such context variable was added in r18381.

Originally committed as revision 21438 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-24 22:47:50 +00:00
Michael Niedermayer
7a14430ed7 Be less picky on invalid frame_pred_frame_dct values. 
Fixed issue1615.

Originally committed as revision 20814 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-12 19:44:01 +00:00
Carl Eugen Hoyos
6e4f40e1f4 Cosmetics: Reindent after r20679. 
Originally committed as revision 20738 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-05 09:41:23 +00:00
Michael Niedermayer
483aad717e slif aka "SoftLab MPEG-2 I-frames Codec" support. 
Flipping one bit still is popular it seems as a means to create a new codec.
fixes issue1469.

Originally committed as revision 20679 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-01 02:07:46 +00:00
Michael Niedermayer
52069c4d3c Move "slice below image" check from mpeg_decode_slice to its caller. 
Should fix issue1277.

Originally committed as revision 20676 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-30 23:08:25 +00:00
Michael Niedermayer
d52b4abe8b Move dummy picture allocation code from mpeg1/2 to mpegvideo. 
This fixes a infinite loop on a b frame.

Originally committed as revision 20672 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-30 21:22:01 +00:00
Michael Niedermayer
078cdecf9e Set mb_y in mpeg2 field pictures like h264 does. 
This fixes -vismv & -debug 16384 with field pictures.

Originally committed as revision 20670 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-30 19:14:00 +00:00
Michael Niedermayer
ab8c48de8c Start decoding from seq/gop too, not just I frames. 
Possibly fixes issue1124.

Originally committed as revision 20667 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-30 03:32:43 +00:00
Michael Niedermayer
f0ec239438 Fix dual prime motion compensation in field pictures. 
Fixes issue1125.

Originally committed as revision 20666 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-30 02:37:03 +00:00
Michael Niedermayer
aeaef4ed63 Print errors instead of just ignoring contradictionary values in mpeg2 silently. 
Originally committed as revision 20656 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-29 14:31:40 +00:00
Michael Niedermayer
87f6806069 Override a few values read so as to ensure that things are not inconsistent. 
Originally committed as revision 20654 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-29 03:32:30 +00:00
Michael Niedermayer
d9b99556bf Restructure dummy frame allocation. 
New code also allocates a dummy frame for an p field after an i field,
previously that could segfault due to reading from NULL+x.

Originally committed as revision 20653 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-29 03:05:11 +00:00
Michael Niedermayer
9d13016690 Make sure field_select is not set to nonsensical values even if unused. 
Fixed an assert failure.

Originally committed as revision 20646 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-29 01:50:43 +00:00
Michael Niedermayer
1c3260939d Factorize "s->first_slice = 1" out. 
Originally committed as revision 20645 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-28 23:17:46 +00:00
Michael Niedermayer
88eba670fb Also check the location of the picture start code and picture coding 
extension a little.

Originally committed as revision 20644 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-28 23:05:06 +00:00
Michael Niedermayer
fc23d843e1 Check order of startcodes, ignore some obviously wrong ones. 
Fixes issue487.

Originally committed as revision 20643 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-28 22:51:53 +00:00
Michael Niedermayer
bbf266fdb5 Move mpeg_decode_postinit() out of bitstream decoding functions, it does not 
belong in there.

Originally committed as revision 20642 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-28 21:32:33 +00:00
Michael Niedermayer
1206f1d630 Inline mpeg_decode_extension, will simplify future changes. 
Originally committed as revision 20641 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-28 18:57:12 +00:00
Michael Niedermayer
191ad11e91 Simplify mpeg_decode_user_data() 
Originally committed as revision 20640 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-28 14:17:28 +00:00
Ronald S. Bultje
6e44ba1550 Use get_bits_left() instead of size_in_bits - get_bits_count(). 
Originally committed as revision 20543 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-16 17:42:43 +00:00
Reimar Döffinger
01418506a2 Remove casts that are useless since the argument is void *. 
Originally committed as revision 20177 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-06 06:33:18 +00:00
Gwenole Beauchesne
25450bb252 Move down HWAccel code path so that to fill in s->mb_x first. 
Originally committed as revision 19875 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 07:49:08 +00:00
Baptiste Coudurier
6be8b20466 Revert r19317, "simplify slice_end, return size of output frame". 
It returns non decodable B-frames.

Originally committed as revision 19324 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-01 20:35:28 +00:00