virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity
20,609 Commits 39 Branches 425 Tags
61e8efd35eb3045300003ded688accd0f1207028
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Reimar Döffinger 61e8efd35e Search for ipmovie signature beyond the start of the file. 
This allows to play directly files that combine player and movie into
a single executable like http://samples.mplayerhq.hu/game-formats/interplay-mve/DES3S.EXE

Originally committed as revision 19769 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-05 15:41:32 +00:00
Reimar Döffinger 78bfe6c3c1 Extend ipmovie signature to match exactly one place in mve files that have a 
player binary prepended.

Originally committed as revision 19768 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-05 11:30:55 +00:00
Reimar Döffinger 23638d8778 Remove unused variable. 
Originally committed as revision 19745 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-30 08:29:11 +00:00
Reimar Döffinger 7f4fca038d Increase maximum encoded subtitle size from 64 kB to 1 MB. 
Fixes "dvd_subtitle too big" errors when encoding HD video subtitles
to DVD format.

Originally committed as revision 19713 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-26 10:22:27 +00:00
Reimar Döffinger 63a78ef131 100l typo, xsub encoder printed end time hours where minutes should have been. 
Originally committed as revision 19712 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-26 10:08:00 +00:00
Reimar Döffinger 64e657fd2c 100l, inv_zigzag_direct16 must be aligned to 16 bytes for dct_quantize_SSE2 
(which uses movdqa to xmm1 on inv_zigzag_direct16).

Originally committed as revision 19711 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-26 09:10:51 +00:00
Reimar Döffinger 8b03c014f0 Make sure that start_display_time is 0 by moving its value onto pts. 
If it was not 0, subtitle encoding would fail.

Originally committed as revision 19710 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-26 08:43:11 +00:00
Reimar Döffinger 44ed34b790 Check for seek failures in avi_load_index, otherwise if the index offset 
is invalid (e.g. truncated file) we might end up reading the whole file
since trying to seek beyond the end of file does not set EOF.

Originally committed as revision 19709 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-26 08:38:44 +00:00
Reimar Döffinger d5a30f86d4 Reindent. 
Originally committed as revision 19708 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-26 01:29:10 +00:00
Reimar Döffinger c7d28f4388 Remove now dead code. 
Originally committed as revision 19707 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-26 01:28:41 +00:00
Reimar Döffinger b02316146b Apply r19642 also pgssubdec: 
Make sure AVSubtitle is initialized, memset it to 0.

Originally committed as revision 19706 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-26 01:27:58 +00:00
Reimar Döffinger 49056037a8 Mark video from .mtv files correctly as upside-down. 
Originally committed as revision 19698 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-25 07:47:34 +00:00
Reimar Döffinger f2d702e109 Replace #ifdef PIC checks with the more appropriate HAVE_EBX_AVAILABLE/HAVE_7REGS. 
Originally committed as revision 19676 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-21 09:54:28 +00:00
Reimar Döffinger 29d7eef7dc Always allocate a buffer of AVPALETTE_SIZE for palette in the subtitle 
decoders instead of as small as possible.
This avoids completely unnecessary issues with e.g. libswscale.

Originally committed as revision 19673 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-20 18:54:50 +00:00
Reimar Döffinger 64d39b7c76 Free initial swscale context, too. Avoids a valgrind warning. 
Originally committed as revision 29538 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-19 08:21:55 +00:00
Reimar Döffinger 7b67bd92f4 Remove useless casts of malloc return value. 
Originally committed as revision 29537 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-19 08:18:53 +00:00
Reimar Döffinger cea0b5272d Fix start_display_time/end_display_time to be relative to packet pts in xsub decoder. 
Makes no difference for the sample AVI files since they all have no packet pts values.

Originally committed as revision 19646 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-15 09:12:58 +00:00
Reimar Döffinger 4a3190ed40 Reindent. 
Originally committed as revision 19645 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-15 00:58:26 +00:00
Reimar Döffinger fd35d6d097 Remove code that is now dead. 
Originally committed as revision 19644 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-15 00:57:24 +00:00
Reimar Döffinger 90ea6fce1e Simplify initialization of AVSubtitle by using memset. 
Originally committed as revision 19643 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-15 00:52:41 +00:00
Reimar Döffinger df47d24501 Make sure AVSubtitle is initialized, memset it to 0. 
Originally committed as revision 19642 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-15 00:46:33 +00:00
Reimar Döffinger 266649a52f 100l, error out if subtitle encoder failed instead of writing an AVPacket 
with ridiculous size and thus crashing.

Originally committed as revision 19641 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-15 00:37:31 +00:00
Reimar Döffinger ffbe087b58 Fix cmd_pos bounds check to avoid the overflow case. 
Originally committed as revision 19640 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-15 00:02:42 +00:00
Reimar Döffinger 5e039e1b4c Add extra validation checks to ff_vorbis_len2vlc. 
They should not be necessary, but it seems like a reasonable precaution.

Originally committed as revision 19374 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-08 19:39:23 +00:00
Reimar Döffinger 1de4ba7155 Make sure that values generated for ff_vorbis_len2vlc in 
vorbis_parse_setup_hdr_codebooks are in the valid range (<=32).

Originally committed as revision 19373 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-08 19:31:04 +00:00
Reimar Döffinger 96f0731a26 Check for packet_length 0, it is already treated as invalid by the padding check, 
but that resulted in a confusing/wrong error message.

Originally committed as revision 19361 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-06 17:08:32 +00:00
Reimar Döffinger 4f76697b3e Change av_free to av_freep 
Originally committed as revision 19360 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-06 16:49:36 +00:00
Reimar Döffinger 16c8318513 Reallocate internal buffer when coded frame size changes. 
Fixes out-of-bounds reads and writes with i32/smclocki32.avi.1.0 from issue 1240.

Originally committed as revision 19359 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-06 16:48:23 +00:00
Reimar Döffinger 28bcc76ab7 Change iv_decode_frame to get AVCodecContext as argument, so that 
avcodec_check_dimensions can be called with a proper context instead of NULL.

Originally committed as revision 19358 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-06 16:45:12 +00:00
Reimar Döffinger c79c960ade Remove useless ret variable added in last revision again. 
Originally committed as revision 19357 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-06 10:28:58 +00:00
Reimar Döffinger 7cda815044 100l, theora_decode_init must pass on errors from vp3_decode_init 
Originally committed as revision 19356 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-06 09:35:00 +00:00
Reimar Döffinger c4b7b8bf9c Make decode_init fail if the huffman tables are invalid and thus init_vlc fails. 
Otherwise this will crash during decoding because the vlc tables are NULL.
Partially fixes ogv/smclock.ogv.1.101.ogv from issue 1240.

Originally committed as revision 19355 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-06 09:22:39 +00:00
Reimar Döffinger e13cca4b14 Ensure that the filter limit values do not exceed the maximum allowed value of 127. 
Originally committed as revision 19351 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-05 18:27:39 +00:00
Reimar Döffinger 7fa5f9990b Extend init_loop_filter to work for filter limit values up to 127 instead 
of only up to 64. 127 is the maximum value allowed by the theora specification.

Originally committed as revision 19350 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-05 18:25:58 +00:00
Reimar Döffinger ad92108694 Add a check to vp6_parse_coeff_huffman to ensure it does not overread the input buffer. 
Originally committed as revision 19349 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-05 16:01:51 +00:00
Reimar Döffinger 5be5daf1e5 Check that palctrl is available on init instead of crashing when trying to use 
it on decode.
Fixes mpeg2/smclockmpeg2.avi.2.1 from issue 1240.

Originally committed as revision 19347 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-05 12:14:05 +00:00
Reimar Döffinger 82c9182fe3 If the end of the input buffer is reached while decoding MJPEG and at least 
a valid SOF was found, emulate an EOI.
This allows e.g. to at least decode the available part of incomplete MJPEG frames.

Originally committed as revision 19344 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-04 18:24:43 +00:00
Reimar Döffinger 1496b04c28 Make the MJPEG decoder return -1 when no image was decoded so that decode 
errors are actually recognizable as such.

Originally committed as revision 19343 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-04 18:22:33 +00:00
Reimar Döffinger 643fd8a198 Add a got_picture flag to MJpegDecodeContext which indicates if its picture 
element is valid. Skip the code handling SOS and EOI if not, since it can not
work without a valid AVPicture.
This fixes a crash with mjpeg/smclockmjpeg.avi.1.0 from issue 1240 where the
decoder returned an invalid AVPicture.

Originally committed as revision 19342 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-04 18:20:35 +00:00
Reimar Döffinger b27bf2a7b4 mjpegdec: check that the coded dc_index and ac_index have a valid associated VLC table. 
Removes some disabled dc_index/ac_index checking code that seems to have had
some undocumented issues and should not really be necessary anymore now.
Fixes from issue 1240 the files mjpeg/smclockmjpeg.avi.1.10 and mjpeg/smclockmjpeg.avi.1.171.

Originally committed as revision 19341 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-04 12:54:36 +00:00
Reimar Döffinger 11d058b7b3 Replace invalid Theora frame rate by 25 FPS. 
Avoids division by 0 due to e.g. time_base denominator being 0.

Originally committed as revision 19334 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-03 11:31:09 +00:00
Reimar Döffinger 3dcddf82ed Check for failed extradata malloc, fixes a crash in out-of-memory conditions 
or with extremely large extradata.

Originally committed as revision 19333 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-03 11:27:52 +00:00
Reimar Döffinger 5a4a4d7839 Check size of "strf" header against size of enclosing "LIST" if there is one. 
Originally committed as revision 19332 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-03 11:26:14 +00:00
Reimar Döffinger b098b30905 Fix indentation 
Originally committed as revision 19331 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-03 11:18:56 +00:00
Reimar Döffinger 68a10b40bc Avoid divisions by 0 in the ASF demuxer if packet_size is not valid. 
Originally committed as revision 19330 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-03 11:18:07 +00:00
Reimar Döffinger 8d8409ca9f Fix nalsize check to avoid an integer overflow that made the check 
incorrect for nalsize > INT_MAX - buf_index

Originally committed as revision 19307 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-30 12:11:29 +00:00
Reimar Döffinger e1c1b0ff09 Reindent after last patch. 
Originally committed as revision 19265 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-24 09:40:00 +00:00
Reimar Döffinger 3fe4d5d4e6 mov demuxer: Track the current position also for streams that have AVDISCARD_ALL set. 
This allows for seamless switching of e.g. audio streams, with the previous code
playback started always from the beginning when removing AVDISCARD_ALL.

Originally committed as revision 19264 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-24 09:38:42 +00:00
Reimar Döffinger 5dc5c43bda mov_read_packet: extract code that searches for the stream/sample to demux next 
into a separate function.

Originally committed as revision 19263 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-24 08:57:53 +00:00
Reimar Döffinger a2f3851166 mov_read_packet: if dv_get_packet fails, return exactly its error value 
instead of always -1 (makes no real difference currently since dv_get_packet
always returns -1 so far).

Originally committed as revision 19262 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-24 08:50:46 +00:00
Reimar Döffinger 69fc436cbc In mov_read_packet remember the AVStream we want to demux next instead of the 
MOVStreamContext. We need the AVStream anyway and it is easier to get the
MOVStreamContext from the AVStream than the other way around.

Originally committed as revision 19261 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-24 08:23:40 +00:00
Reimar Döffinger 2a04d6e772 Add support for muxing XSUB subtitles to AVI muxer. 
Originally committed as revision 19223 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-19 13:26:10 +00:00
Reimar Döffinger a4276ba2ac Add support for encoding XSUB subtitles. Muxing support is still missing. 
Based on code by DivX, Inc., heavily changed by Björn Axelsson [gecko acc.umu.se] and me.

Originally committed as revision 19222 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-19 09:56:35 +00:00
Reimar Döffinger 4bbe788ab7 Add pts field to AVSubtitle, for use by future XSUB encoder (and XSUB decoder 
should use it, too).

Originally committed as revision 19221 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-19 08:28:07 +00:00
Reimar Döffinger 10f9ff9bf6 Set AV_PKT_FLAG_KEY in avcodec_decode_video. 
This fixes decoding of MPNG, which currently is incorrectly decoded as
CorePNG delta frames.
CorePNG can not be correctly decoded via this old API either way.

Originally committed as revision 19079 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-03 11:23:16 +00:00
Reimar Döffinger 8f3f2e0676 Add AV_PKT_FLAG_KEY and deprecate PKT_FLAG_KEY. 
Originally committed as revision 19078 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-03 11:20:35 +00:00
Reimar Döffinger 24dd21fa41 add #if CONFIG_ZLIB_DECODER around zlib_decomp function. 
Fixes compilation when zlib is not available.

Originally committed as revision 19069 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 19:51:21 +00:00
Reimar Döffinger 79183d3c3e mszh decompression: add a special case for an all-0 mask, i.e. 32 uncompressed 
bytes in a row.
About 15% faster mszh_decomp on an Atom N270 for
http://samples.mplayerhq.hu/V-codecs/mszh-zlib/avimzsh_sample.avi

Originally committed as revision 19068 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 18:17:33 +00:00
Reimar Döffinger a7bfbe4e13 lcldec: ensure that the offset for av_memcpy_backptr is valid. 
Originally committed as revision 19067 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 17:44:35 +00:00
Reimar Döffinger c70ac8e7f5 I will take care of the lcl de-/encoder while Roberto is unavailable. 
Originally committed as revision 19065 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 11:50:30 +00:00
Reimar Döffinger bbf306742c Fix memleak due to c->decomp_buf never being freed. 
Originally committed as revision 19064 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 11:47:52 +00:00
Reimar Döffinger 908425c758 Only call inflateEnd when we were actually using the zlib code. 
Originally committed as revision 19063 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 11:42:50 +00:00
Reimar Döffinger 4ad3df9da2 avctx->priv_data is initialized to 0, get rid of useless extra initialization. 
Originally committed as revision 19062 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 11:41:49 +00:00
Reimar Döffinger 7ffc844742 Merge variable declaration and initialization. 
Originally committed as revision 19061 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 11:35:20 +00:00
Reimar Döffinger 7c20421661 Use int-size types instead of char where it makes no difference. 
Originally committed as revision 19060 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 11:34:19 +00:00
Reimar Döffinger 7a15b25827 Take advantage of available input padding to optimize mszh_decomp 
Originally committed as revision 19059 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 11:32:03 +00:00
Reimar Döffinger a5d2745d8e Change maskbit variable to contain (1 << maskbit) 
Originally committed as revision 19058 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 10:58:20 +00:00
Reimar Döffinger e0b3af9059 Remove check that thanks to padding is no longer necessary. 
Originally committed as revision 19057 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 10:53:47 +00:00
Reimar Döffinger 0b99764459 100l, the compression field in lcl extradata must be interpreted as 
int8_t, not uint8_t to allow -1 for "no compression".
The original code worked, but only when char was signed.

Originally committed as revision 19056 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 10:50:54 +00:00
Reimar Döffinger e4f141ad60 One more use for FFMIN. 
Originally committed as revision 19055 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 10:44:42 +00:00
Reimar Döffinger 0d48e6ec7f Pad the decompression buffer and use av_memcpy_backptr for the mszh decompression. 
Originally committed as revision 19054 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 10:42:26 +00:00
Reimar Döffinger 974ce78544 Mark srcptr as const in mszh_decomp 
Originally committed as revision 19053 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 10:38:17 +00:00
Reimar Döffinger 6065dcea37 Remove unnecessary put_bits/get_bits includes. 
Originally committed as revision 19052 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 10:37:05 +00:00
Reimar Döffinger 2bee59083d Use bytestream_get_le16 to simplify offset/count calculation for mszh decompression. 
Originally committed as revision 19051 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 10:35:39 +00:00
Reimar Döffinger 5a18221ba8 Remove useless & 0x1f 
Originally committed as revision 19050 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 10:31:37 +00:00
Reimar Döffinger 7b151a98b0 Document padding requirements of mszh_decomp srcptr buffer 
Originally committed as revision 19049 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 10:28:40 +00:00
Reimar Döffinger 5e5fe7dab5 Use srcptr_end variable to avoid having to update both srcptr and srclen. 
Originally committed as revision 19048 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 10:26:58 +00:00
Reimar Döffinger dbc53ffc7c Change buffer size checks to avoid the undefined overflow case. 
Originally committed as revision 19047 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 10:23:38 +00:00
Reimar Döffinger 2fddb91e94 Simply use memcpy instead of AV_RN32/AV_WN32 combination. 
Originally committed as revision 19046 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 10:16:28 +00:00
Reimar Döffinger 661cb0d4a9 Fix decoding of multithread-encoded lcl files on big-endian. 
Originally committed as revision 19045 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 10:14:27 +00:00
Reimar Döffinger ce22c7d075 Remove another useless () 
Originally committed as revision 19044 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 10:05:21 +00:00
Reimar Döffinger 21bf2f51d7 Correct calculation of compressed input length. 
Originally committed as revision 19043 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 10:01:26 +00:00
Reimar Döffinger 46adcc27a2 Add sanity check for mthread_inlen, avoids crashes due to invalid reads. 
Originally committed as revision 19042 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 09:59:46 +00:00
Reimar Döffinger 1207c84adb Use FFMIN 
Originally committed as revision 19041 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 09:57:42 +00:00
Reimar Döffinger c2c0c1c023 Factor out zlib decompression code to avoid massive code duplication, 
particularly due to error checks.

Originally committed as revision 19040 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 09:51:46 +00:00
Reimar Döffinger f005808bf2 Use FFALIGN 
Originally committed as revision 19039 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 09:28:29 +00:00
Reimar Döffinger 46c02b1b50 Move variable into block where it is used, avoiding a unused variable 
warning if the zlib decoder is disabled.

Originally committed as revision 19038 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 09:27:07 +00:00
Reimar Döffinger 2b550f816a Make lcldec less annoyingly verbose, move messages from AV_LOG_INFO to AV_LOG_DEBUG. 
Originally committed as revision 19037 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 09:23:54 +00:00
Reimar Döffinger 75f6d6c7e6 Get rid of unreachable code: avctx->codec_id == CODEC_ID_ZLIB is not possible 
here when the zlib decoder is disabled and libavcodec is used correctly.

Originally committed as revision 19036 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 09:19:21 +00:00
Reimar Döffinger 56b44694bd lcldec.c: change #if CONFIG_ZLIB to #if CONFIG_ZLIB_DECODER. 
The zlib related code should not be compiled in when the decoder is disabled
and it thus will never be used, even if we have zlib available.

Originally committed as revision 19035 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 09:16:06 +00:00
Reimar Döffinger 445e0ab539 Get rid of extradata casts, it already has the right uint8_t * type 
Originally committed as revision 19034 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 09:12:17 +00:00
Reimar Döffinger 8c18e490c4 Make lcldec produce YUV output when the input file is coded like that, instead 
of having it do its own inefficient fixed-point YUV to RGB conversion.

Originally committed as revision 19033 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 09:09:32 +00:00
Reimar Döffinger 55619690e8 Remove now unused elements from LclEncContext 
Originally committed as revision 19032 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 08:54:41 +00:00
Reimar Döffinger 3b855101b4 Remove useless casts, extradata is already "uint8_t *" 
Originally committed as revision 19031 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 08:51:30 +00:00
Reimar Döffinger e786d3cf80 lclenc.c: compress directly into output buffer instead of using a pointless 
temporary buffer and then using put_bits to copy the data over.

Originally committed as revision 19030 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 08:49:27 +00:00
Reimar Döffinger 32b3ab9b60 Remove superfluous () from lclenc.c 
Originally committed as revision 19028 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 08:41:11 +00:00
Reimar Döffinger 8f033e3e03 Cosmetics: fix indentation in lclenc.c 
Originally committed as revision 19027 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 08:38:51 +00:00
Reimar Döffinger 7ff7ac60e1 Remove "#if CONFIG_ZLIB" checks from lclenc.c, the file is never compiled 
if zlib is not available.

Originally committed as revision 19026 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 08:36:44 +00:00
Reimar Döffinger bb79016851 Use memcpy instead of per-pixel copy loop for rgb lcl format 
Originally committed as revision 18997 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-30 11:20:07 +00:00
Reimar Döffinger c40f366372 Remove useless () from lcldec for more consistency with "normal" FFmpeg coding style. 
Originally committed as revision 18995 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-30 09:07:10 +00:00