diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-08 00:23:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-08 00:23:37 +0100 |
| commit | 8e2bab5d4bddb4029503c0f90623854948ddb3c5 (patch) | |
| tree | 33a095ce0e92ed353c96c9b25b746ee45a2a00c7 /libavcodec/mpeg12enc.c | |
| parent | 7023fb81c78e10a6a7af6e6bc8902f99da81c458 (diff) | |
| parent | 78212cefe14a2086dc1ea3778b76623b949e5d0c (diff) | |
| download | ffmpeg-8e2bab5d4bddb4029503c0f90623854948ddb3c5.tar.gz | |
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>
Diffstat (limited to 'libavcodec/mpeg12enc.c')
0 files changed, 0 insertions, 0 deletions