Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-02-07 10:19:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
ffmpeg/libavcodec/ppc
History
Michael Niedermayer 8e2bab5d4b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  drawtext: remove typo
  pcm-mpeg: implement new audio decoding api
  w32thread: port fixes to pthread_cond_broadcast() from x264.
  doc: add editor configuration section with Vim and Emacs settings
  dxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9
  avformat/utils: Drop unused goto label.
  doxygen: Replace '\' by '@' in Doxygen markup tags.
  cosmetics: drop some completely pointless parentheses
  cljr: simplify CLJRContext
  drawtext: introduce rand(min, max)
  drawtext: introduce explicit draw/hide variable
  rtmp: Use nb_invokes for all invoke commands

Conflicts:
	libavcodec/mpegvideo.c
	libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-08 00:23:37 +01:00
..
asm.S Merge remote-tracking branch 'qatar/master' 2011-09-25 23:30:25 +02:00
dsputil_altivec.c Merge remote-tracking branch 'qatar/master' 2011-07-22 12:08:52 +02:00
dsputil_altivec.h
dsputil_ppc.c ppc: fix usage of dsp_mask 2011-09-30 02:43:20 +02:00
fdct_altivec.c Merge remote-tracking branch 'qatar/master' 2011-07-16 19:43:35 +02:00
fft_altivec.c Merge remote-tracking branch 'qatar/master' 2011-07-06 01:34:08 +02:00
fft_altivec_s.S Merge remote-tracking branch 'qatar/master' 2011-09-25 23:30:25 +02:00
float_altivec.c
fmtconvert_altivec.c
gmc_altivec.c
h264_altivec.c Merge remote-tracking branch 'qatar/master' 2011-12-08 00:23:37 +01:00
h264_template_altivec.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
idct_altivec.c
int_altivec.c
Makefile mpegaudiodsp: fix x86 and ppc makefiles 2011-05-19 16:32:24 +01:00
mathops.h
mpegaudiodec_altivec.c Merge remote-tracking branch 'qatar/master' 2011-05-20 05:48:22 +02:00
mpegvideo_altivec.c mpegvideo: support encoding with chroma intra tables that differ from luma. 2011-09-25 12:29:20 +02:00
regs.h
types_altivec.h
util_altivec.h Merge remote-tracking branch 'qatar/master' 2011-12-08 00:23:37 +01:00
vc1dsp_altivec.c Merge remote branch 'qatar/master' 2011-05-05 03:30:24 +02:00
vp3dsp_altivec.c
vp8dsp_altivec.c