8e2bab5d4b
* 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> |
||
|---|---|---|
| .. | ||
| asm.S | ||
| dsputil_altivec.c | ||
| dsputil_altivec.h | ||
| dsputil_ppc.c | ||
| fdct_altivec.c | ||
| fft_altivec_s.S | ||
| fft_altivec.c | ||
| float_altivec.c | ||
| fmtconvert_altivec.c | ||
| gmc_altivec.c | ||
| h264_altivec.c | ||
| h264_template_altivec.c | ||
| idct_altivec.c | ||
| int_altivec.c | ||
| Makefile | ||
| mathops.h | ||
| mpegaudiodec_altivec.c | ||
| mpegvideo_altivec.c | ||
| regs.h | ||
| types_altivec.h | ||
| util_altivec.h | ||
| vc1dsp_altivec.c | ||
| vp3dsp_altivec.c | ||
| vp8dsp_altivec.c | ||