generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
038325ac05
ffmpeg/libavutil
History
Michael Niedermayer 0f1446a4d0 Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b' 
* commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b':
  vf_overlay: get rid of pointless messing with timebase.
  samplefmt: make av_samples_alloc() initialize the data to silence.
  libspeexdec: handle NULL return value from speex_packet_to_header()
  h264probe: Don't error out on bits that no longer are reserved
  mpegvideo: set extended_data in ff_update_duplicate_context()
  libspeexdec: properly handle DTX for multiple frames-per-packet
  libspeexdec: move the SpeexHeader from LibSpeexContext to where it is used
  libspeexdec: simplify setting of frame_size
  libspeexdec: set channel_layout

Conflicts:
	libavfilter/vf_overlay.c
	libavformat/h264dec.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-04 13:11:45 +02:00
..
arm Merge remote-tracking branch 'qatar/master' 2012-10-03 13:35:02 +02:00
avr32
bfin
mips replace all __volatile__ by volatile 2012-07-11 04:04:29 +02:00
ppc ppc/cpu: make linux 32bit specific altivec detection depend on __linux__ 2012-09-24 13:41:48 +02:00
sh4
tomi
x86 Merge remote-tracking branch 'qatar/master' 2012-09-09 13:27:42 +02:00
adler32.c adler32: add comment for the SIMD code 2012-02-04 20:27:02 +01:00
adler32.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
aes.c Merge remote-tracking branch 'qatar/master' 2011-12-22 01:51:53 +01:00
aes.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
attributes.h lavu: disable av_uninit for clang 2012-07-16 19:30:13 +00:00
audio_fifo.c Don't include common.h from avutil.h 2012-08-15 22:32:06 +03:00
audio_fifo.h avutil: add audio fifo buffer 2012-04-20 09:43:11 -04:00
audioconvert.c Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
audioconvert.h Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
avassert.h Merge remote-tracking branch 'qatar/master' 2011-05-22 04:53:19 +02:00
avstring.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
avstring.h Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
avutil.h avutil: Cast AV_NOPTS_VALUE to int64_t explicitly 2012-09-19 19:49:24 +02:00
base64.c base64: 10l endian fix. 2012-01-22 23:06:04 +01:00
base64.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
blowfish.c Merge commit '29abb04e73b0580ebe38703cadb988d26df6a76a' 2012-10-04 12:30:25 +02:00
blowfish.h blowfish.h: include author attribution 2012-07-04 23:23:17 +02:00
bprint.c bprint: Remove custom vsnprintf 2012-09-15 19:47:10 -04:00
bprint.h lavu/bprint: readd documentation for 0 and 1 av_bprint_init() special values 2012-07-31 13:15:43 +02:00
bswap.h Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
colorspace.h
common.h Merge remote-tracking branch 'qatar/master' 2012-08-13 14:38:43 +02:00
cpu.c Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078' 2012-09-05 14:09:09 +02:00
cpu.h cpu: improve av_get_cpu_flags() doxy 2012-10-01 16:41:37 +02:00
crc_data.h
crc.c Merge remote-tracking branch 'qatar/master' 2011-12-05 00:11:57 +01:00
crc.h Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
des.c av_des_init: suppress warning about unused parameter 2012-09-19 21:57:58 +02:00
des.h Merge remote-tracking branch 'qatar/master' 2011-09-21 21:25:43 +02:00
dict.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
dict.h Merge remote-tracking branch 'qatar/master' 2012-08-11 15:01:45 +02:00
error.c lavu/error: make error_entries static const. 2012-09-16 02:53:32 +02:00
error.h Don't include common.h from avutil.h 2012-08-15 22:32:06 +03:00
eval.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
eval.h Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
fifo.c fifo: add av_fifo_grow() 2012-05-15 18:08:32 +02:00
fifo.h Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
file.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
file.h Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
float_dsp.c Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
float_dsp.h Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
imgutils.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
imgutils.h lavu/imgutils: create misc functions for dealing with buffers 2012-06-26 13:12:12 +02:00
integer.c integer: switch to av_assert 2012-08-09 01:44:15 +02:00
integer.h avutil: Remove unused arbitrary precision integer code. 2011-06-28 13:14:46 +02:00
internal.h Merge commit '29abb04e73b0580ebe38703cadb988d26df6a76a' 2012-10-04 12:30:25 +02:00
intfloat_readwrite.c Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
intfloat_readwrite.h Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
intfloat.h intfloat: Don't use designated initializers in the public headers 2012-07-02 14:05:40 +03:00
intmath.h x86: remove FASTDIV inline asm 2012-08-22 14:29:10 +01:00
intreadwrite.h intreadwrite: Dont evaluate value for AV_W* multiple times. 2012-09-04 21:45:13 +02:00
inverse.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
lfg.c avformat: Remove non-compiling and/or silly commented-out printf/av_log statements 2012-10-01 10:24:28 +02:00
lfg.h Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
libavutil.v libavutil.v: add avpriv prefix 2012-06-09 02:51:02 +02:00
libm.h Merge remote-tracking branch 'qatar/master' 2012-07-11 23:57:11 +02:00
lls.c Merge remote-tracking branch 'qatar/master' 2011-07-12 01:42:32 +02:00
lls.h
log.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
log.h lavu: 256 color support 2012-07-07 01:41:55 +00:00
lzo.c libavutil: Remove broken and pointless lzo test program. 2012-03-26 13:00:09 +02:00
lzo.h Avoid uninitialized data in lcldec when ofs is 0 in MSZH. 2011-12-31 16:31:15 +01:00
Makefile Move xGA font data from lavc to lavu. 2012-10-01 22:24:17 +02:00
mathematics.c libavutil/mathematics: use av_assert() 2012-06-06 20:00:35 +02:00
mathematics.h Merge remote-tracking branch 'qatar/master' 2012-07-01 22:43:09 +02:00
md5.c md5: consistently use uint32_t instead of unsigned int 2012-06-16 12:47:46 +02:00
md5.h Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
mem.c mem: Don't abort on av_malloc(0) in debug mode 2012-07-10 11:37:03 +03:00
mem.h mem: fix typo in check for __ICC 2012-09-10 00:07:26 +01:00
opt.c lavu/opt: cosmetic fixes forgotten in the previous patch. 2012-09-30 10:23:08 +02:00
opt.h lavu/opt: cosmetic fixes forgotten in the previous patch. 2012-09-30 10:23:08 +02:00
parseutils.c fate: add av_small_strptime() test to fate-parseutils 2012-09-17 12:46:55 +02:00
parseutils.h lavu/parseutils: add av_small_strptime() 2012-09-06 00:40:01 +02:00
pca.c Remove unused, never built libavutil/pca.[ch] 2011-06-29 23:49:03 +01:00
pca.h Remove unused, never built libavutil/pca.[ch] 2011-06-29 23:49:03 +01:00
pixdesc.c Merge remote-tracking branch 'qatar/master' 2012-09-04 17:04:51 +02:00
pixdesc.h pixdesc: fix project reference in comment 2012-06-29 11:23:56 +02:00
pixfmt.h cosmetics: various spelling fixes 2012-07-06 17:08:22 +02:00
qsort.h qsort: flip compare direction to match libc qsort() 2012-06-22 22:48:00 +02:00
random_seed.c random_seed: Replace a VLA with a normal array 2012-09-08 17:30:10 +02:00
random_seed.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
rational.c libavutil: Remove pointless rational test program. 2012-03-26 13:00:09 +02:00
rational.h Merge remote-tracking branch 'qatar/master' 2012-08-05 22:17:02 +02:00
rc4.c
rc4.h Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
samplefmt.c Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b' 2012-10-04 13:11:45 +02:00
samplefmt.h Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b' 2012-10-04 13:11:45 +02:00
sha.c Merge remote-tracking branch 'qatar/master' 2012-02-14 01:53:31 +01:00
sha.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01: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
time.c Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
time.h Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
timecode.c lavu/timecode: add av_timecode_check_frame_rate(). 2012-08-08 09:11:26 +02:00
timecode.h lavu/timecode: add av_timecode_check_frame_rate(). 2012-08-08 09:11:26 +02:00
timer.h Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
timestamp.h lavu/timestamp: remove duplicate definition of AV_TS_MAX_STRING_SIZE 2012-06-10 00:37:02 +02:00
tree.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
tree.h lavu/tree: perform minor fixes to av_tree_insert() documentation 2012-05-20 16:19:36 +02:00
utils.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
version.h Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b' 2012-10-04 13:11:45 +02:00
x86_cpu.h x86_cpu.h: newline at the end to shutup some warnings in opencc 2012-09-13 19:31:02 +02:00
xga_font_data.c Move xGA font data from lavc to lavu. 2012-10-01 22:24:17 +02:00
xga_font_data.h Move xGA font data from lavc to lavu. 2012-10-01 22:24:17 +02:00
xtea.c Merge commit '29abb04e73b0580ebe38703cadb988d26df6a76a' 2012-10-04 12:30:25 +02:00
xtea.h Merge remote-tracking branch 'qatar/master' 2012-08-10 16:25:23 +02:00