Michael Niedermayer
ca19862d38
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
libxvid: remove disabled code
qdm2: make a table static const
qdm2: simplify bitstream reader setup for some subpacket types
qdm2: use get_bits_left()
build: Consistently handle conditional compilation for all optimization OBJS.
avpacket, bfi, bgmc, rawenc: K&R prettyprinting cosmetics
msrle: convert MS RLE decoding function to bytestream2.
x86inc improvements for 64-bit
Conflicts:
common.mak
libavcodec/avpacket.c
libavcodec/bfi.c
libavcodec/msrledec.c
libavcodec/qdm2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-13 00:39:19 +02:00
Michael Niedermayer
81ab42a334
dirac_yasm: fix linking failure due to %ifndef
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-28 09:06:03 +01:00
Michael Niedermayer
e37f161e66
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (71 commits)
movenc: Allow writing to a non-seekable output if using empty moov
movenc: Support adding isml (smooth streaming live) metadata
libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set
sunrast: Document the different Sun Raster file format types.
sunrast: Add a check for experimental type.
libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat
lavf: remove disabled FF_API_SET_PTS_INFO cruft
lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft
lavf: remove disabled FF_API_REORDER_PRIVATE cruft
lavf: remove disabled FF_API_SEEK_PUBLIC cruft
lavf: remove disabled FF_API_STREAM_COPY cruft
lavf: remove disabled FF_API_PRELOAD cruft
lavf: remove disabled FF_API_NEW_STREAM cruft
lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft
lavf: remove disabled FF_API_MUXRATE cruft
lavf: remove disabled FF_API_FILESIZE cruft
lavf: remove disabled FF_API_TIMESTAMP cruft
lavf: remove disabled FF_API_LOOP_OUTPUT cruft
lavf: remove disabled FF_API_LOOP_INPUT cruft
lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft
...
Conflicts:
doc/APIchanges
libavcodec/8bps.c
libavcodec/avcodec.h
libavcodec/libx264.c
libavcodec/mjpegbdec.c
libavcodec/options.c
libavcodec/sunrast.c
libavcodec/utils.c
libavcodec/version.h
libavcodec/x86/h264_deblock.asm
libavdevice/libdc1394.c
libavdevice/v4l2.c
libavformat/avformat.h
libavformat/avio.c
libavformat/avio.h
libavformat/aviobuf.c
libavformat/dv.c
libavformat/mov.c
libavformat/utils.c
libavformat/version.h
libavformat/wtv.c
libavutil/Makefile
libavutil/file.c
libswscale/x86/input.asm
libswscale/x86/swscale_mmx.c
libswscale/x86/swscale_template.c
tests/ref/lavf/ffm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-28 07:53:34 +01:00
Michael Niedermayer
7776091b9f
diracdec: obmc accesses arent aligned for all files.
...
Thus use unaligned accesses.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-15 23:37:40 +01:00
Michael Niedermayer
d2ea38ddb7
dirac: alignment for dirac_hpel_filter_v has been fixed
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 17:03:03 +01:00
Michael Niedermayer
18f2ae3b77
dirac: alignment for add_dirac_obmc has been fixed
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 17:00:59 +01:00
Michael Niedermayer
4debdee6ce
dirac: alignment for add_rect_clamped has been fixed
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 17:00:40 +01:00
Michael Niedermayer
66b6d7bcd7
dirac: alignment for put_signed_rect_clamped has been fixed
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 17:00:03 +01:00
Michael Niedermayer
2eecf63086
dirac: alignment for dirac_hpel_filter_v() has been fixed
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 16:59:23 +01:00
Michael Niedermayer
22fe93ea39
dirac: add_rect_clamped does currently not receive aligned data, thus use unaligned accesses.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 23:26:29 +01:00
Michael Niedermayer
d532e9223e
dirac: put_signed_rect_clamped does currently not receive aligned data, thus use unaligned accesses.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 23:25:49 +01:00
Michael Niedermayer
5f34092b13
dirac; dirac_hpel_filter_h does currently not receive aligned data thus use unaligned accesses.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 23:25:08 +01:00
Michael Niedermayer
f0d616e76f
dirac: dirac_hpel_filter_v does currently not receive aligned data, thus use unaligned accesses.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 23:24:19 +01:00
multiple authors
5d50fcc549
DIRAC Decoder stable version, MMX support removed.
...
Look for MMX_DISABLED to find the disabled functions.
Authors of this code are Marco Gerards <marco@gnu.org> and David Conrad <lessen42@gmail.com>
With changes from Jordi Ortiz <nenjordi@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 21:50:08 +01:00
