Changeset e847f412 in ffmpeg

Timestamp:

Jun 22, 2012, 8:34:02 PM (12 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0567715

Parents:

492cc9bc (diff), 9ee3334 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: libspeexenc: add supported sample rates and channel layouts. Replace usleep() calls with av_usleep() lavu: add av_usleep() function utvideo: mark interlaced frames as such utvideo: Fix interlaced prediction for RGB utvideo. cosmetics: do not use full path for local headers lavu/file: include unistd.h only when available configure: check for unistd.h log: include unistd.h only when needed lavf: include libavutil/time.h instead of redeclaring av_gettime()

Conflicts:

configure
doc/APIchanges
ffmpeg.c
ffplay.c
libavcodec/utvideo.c
libavutil/avutil.h

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)