highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
ffmpeg/libavutil
History
Michael Niedermayer 779d7610c7 Merge branch 'master' into oldabi 
* master: (109 commits)
  libx264: fix open gop default. Please use -x264opts to force open gop This fixes Ticket268
  avfilter picture pool: double free hotfix
  mpegaudio_parser: be less picky on the start position
  ppc32: Fix movrel
  Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().
  x86: cabac: fix register constraints for 32-bit mode
  cabac: move x86 asm to libavcodec/x86/cabac.h
  x86: h264: cast pointers to intptr_t rather than int
  x86: h264: remove hardcoded edi in decode_significance_8x8_x86()
  x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86()
  x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86()
  x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86()
  x86: cabac: change 'a' constraint to 'r' in get_cabac_inline()
  x86: cabac: remove hardcoded esi in get_cabac_inline()
  x86: cabac: remove hardcoded edx in get_cabac_inline()
  x86: cabac: remove unused macro parameter
  x86: cabac: remove hardcoded ebx in inline asm
  x86: cabac: remove hardcoded struct offsets from inline asm
  cabac: remove inline asm under #if 0
  cabac: remove BRANCHLESS_CABAC_DECODER switch
  ...

Conflicts:
	cmdutils.c
	ffserver.c
	libavfilter/avfilter.h
	libavformat/avformat.h
	libavformat/utils.c
	libavformat/version.h
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-21 05:27:44 +02:00
..
arm
Merge remote-tracking branch 'qatar/master'
2011-05-31 02:08:20 +02:00
avr32
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
bfin
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
mips
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
ppc
Merge remote branch 'qatar/master'
2011-05-13 04:40:40 +02:00
sh4
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
tomi
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
x86
Merge remote branch 'qatar/master'
2011-04-24 03:41:22 +02:00
adler32.c
…
adler32.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
aes.c
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
aes.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
attributes.h
Merge remote-tracking branch 'newdev/master'
2011-03-24 02:16:11 +01:00
audioconvert.c
Merge remote-tracking branch 'qatar/master'
2011-06-08 05:25:28 +02:00
audioconvert.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
avassert.h
Merge remote-tracking branch 'qatar/master'
2011-05-22 04:53:19 +02:00
avstring.c
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
avstring.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
avutil.h
Merge branch 'master' into oldabi
2011-06-21 05:27:44 +02:00
base64.c
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
base64.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
bswap.h
bswap.h: Remove disabled code.
2011-04-29 20:01:04 +02:00
colorspace.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
common.h
Merge remote branch 'qatar/master'
2011-05-14 02:19:58 +02:00
cpu.c
cpudetect: add av_force_cpu_flags()
2011-06-02 21:03:54 +02:00
cpu.h
cpudetect: add av_force_cpu_flags()
2011-06-02 21:03:54 +02:00
crc_data.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
crc.c
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
crc.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
des.c
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
des.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
dict.c
Merge remote-tracking branch 'qatar/master'
2011-06-18 05:10:38 +02:00
dict.h
Merge remote-tracking branch 'qatar/master'
2011-06-18 05:10:38 +02:00
error.c
Merge branch 'master' into oldabi
2011-06-16 06:29:01 +02:00
error.h
Merge branch 'master' into oldabi
2011-04-25 03:49:47 +02:00
eval.c
eval: Fix 32bit unsigned parsing
2011-06-20 01:58:18 +02:00
eval.h
lavu: remove FF_API_OLD_EVAL_NAMES cruft
2011-04-19 19:03:44 +02:00
fifo.c
fifo: use av_freep()
2011-05-09 21:23:45 +02:00
fifo.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
file.c
Fix error check in av_file_map()
2011-06-04 17:03:25 +01:00
file.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
imgutils.c
Merge branch 'master' into oldabi
2011-06-16 06:29:01 +02:00
imgutils.h
Merge branch 'master' into oldabi
2011-06-16 06:29:01 +02:00
integer.c
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
integer.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
internal.h
Merge remote-tracking branch 'qatar/master'
2011-06-09 04:47:19 +02:00
intfloat_readwrite.c
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
intfloat_readwrite.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
intmath.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
intreadwrite.h
Merge remote-tracking branch 'qatar/master'
2011-06-18 05:10:38 +02:00
inverse.c
Merge remote-tracking branch 'qatar/master'
2011-06-08 05:25:28 +02:00
lfg.c
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
lfg.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
libavutil.v
…
libm.h
Merge remote branch 'qatar/master'
2011-04-22 03:54:30 +02:00
lls.c
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
lls.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
log.c
Merge branch 'master' into oldabi
2011-05-15 19:18:02 +02:00
log.h
Merge remote-tracking branch 'qatar/master'
2011-06-18 05:10:38 +02:00
lzo.c
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
lzo.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
Makefile
Merge branch 'master' into oldabi
2011-06-16 06:29:01 +02:00
mathematics.c
av_compare_ts: Improve speed when calculations fit in 64bit.
2011-05-11 20:41:19 +02:00
mathematics.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
md5.c
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
md5.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
mem.c
Merge branch 'master' into oldabi
2011-06-16 06:29:01 +02:00
mem.h
Merge branch 'master' into oldabi
2011-05-15 19:18:02 +02:00
opt.c
opt: do not crash in av_set_options_string() if opts == NULL
2011-06-19 19:13:05 +02:00
opt.h
opt: do not crash in av_set_options_string() if opts == NULL
2011-06-19 19:13:05 +02:00
parseutils.c
Merge remote-tracking branch 'qatar/master'
2011-06-08 05:25:28 +02:00
parseutils.h
Merge remote-tracking branch 'qatar/master'
2011-06-08 05:25:28 +02:00
pca.c
Merge remote branch 'qatar/master'
2011-04-27 03:51:04 +02:00
pca.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
pixdesc.c
Merge remote-tracking branch 'qatar/master'
2011-06-11 03:51:36 +02:00
pixdesc.h
pixdesc: remove duplicated header inclusion
2011-06-06 11:34:45 +02:00
pixfmt.h
Merge remote-tracking branch 'qatar/master'
2011-06-11 03:51:36 +02:00
random_seed.c
Merge remote branch 'qatar/master'
2011-04-21 03:37:05 +02:00
random_seed.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
rational.c
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
rational.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
rc4.c
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
rc4.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
samplefmt.c
Merge remote-tracking branch 'qatar/master'
2011-06-08 05:25:28 +02:00
samplefmt.h
Merge remote-tracking branch 'qatar/master'
2011-06-08 05:25:28 +02:00
sha1.h
Revert removial of 3 files, this sliped through the last merge into oldabi because
2011-04-27 00:03:39 +02:00
sha.c
Merge remote branch 'qatar/master'
2011-04-21 03:37:05 +02:00
sha.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
softfloat.c
Remove unused softfloat implementation.
2011-05-11 13:43:30 +02:00
softfloat.h
Remove unused softfloat implementation.
2011-05-11 13:43:30 +02:00
timer.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
tree.c
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
tree.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00
utils.c
Merge remote branch 'qatar/master'
2011-04-27 03:51:04 +02:00
x86_cpu.h
Replace FFmpeg with Libav in licence headers
2011-03-19 13:33:20 +00:00