diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-07 02:41:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-07 03:01:43 +0100 |
| commit | 13b7781ec8d475513c1ee40a6e481763b728a71e (patch) | |
| tree | 953bee0a6461e74085e45e1f7793de6f850534e5 /libavdevice | |
| parent | ada8d485c0f77a4e79fac7f3f96031c4d0e6bc7a (diff) | |
| parent | f2bd8a0786ded12c70d6877f16944b44ea731462 (diff) | |
| download | ffmpeg-13b7781ec8d475513c1ee40a6e481763b728a71e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (23 commits)
x86inc: use sse versions of common macros instead of sse2 when applicable
doc/APIchanges: add missing dates and hashes
lavf: don't return from void av_update_cur_dts()
Changelog: add more entries.
Changelog: update ffmpeg/avconv incompatibility list.
avconv: remove some redundant temporary variables.
avconv: fix broken indentation
avconv: move copy_initial_nonkeyframes to the options context.
avconv: use file:stream instead of file.stream in log messages.
doc/avconv: elaborate on basic functionality.
doc/avconv: -sample_fmts, not -help sample_fmts prints the sample formats
openssl: Only use CRYPTO_set_id_callback on OpenSSL < 1.0.0
Call avformat_network_init/deinit in the programs
Remove leftover includes of strings.h
avutil: Don't allow using strcasecmp/strncasecmp
Replace all usage of strcasecmp/strncasecmp
avstring: Add locale independent implementations of strcasecmp/strncasecmp
avstring: Add locale independent implementations of toupper/tolower
cosmetics: insert some spaces in explicit enum value assignments
move 8SVX audio codecs to the audio codec list part on the next bump
...
Conflicts:
avprobe.c
doc/APIchanges
ffplay.c
ffserver.c
libavcodec/avcodec.h
libavdevice/bktr.c
libavdevice/v4l.c
libavdevice/v4l2.c
libavformat/matroskaenc.c
libavformat/wtv.c
libavutil/avstring.c
libavutil/avstring.h
libavutil/avutil.h
libswscale/x86/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/bktr.c | 1 | ||||
| -rw-r--r-- | libavdevice/dv1394.c | 1 | ||||
| -rw-r--r-- | libavdevice/v4l.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c index db917c450a..72f0cc272e 100644 --- a/libavdevice/bktr.c +++ b/libavdevice/bktr.c @@ -46,7 +46,6 @@ #include <sys/time.h> #include <signal.h> #include <stdint.h> -#include <strings.h> #include "avdevice.h" typedef struct { diff --git a/libavdevice/dv1394.c b/libavdevice/dv1394.c index 44d401a99f..30bbe6b482 100644 --- a/libavdevice/dv1394.c +++ b/libavdevice/dv1394.c @@ -28,7 +28,6 @@ #include <sys/mman.h> #include <sys/time.h> #include <time.h> -#include <strings.h> #include "libavutil/log.h" #include "libavutil/opt.h" diff --git a/libavdevice/v4l.c b/libavdevice/v4l.c index 3e5e5eb919..bbb58fbded 100644 --- a/libavdevice/v4l.c +++ b/libavdevice/v4l.c @@ -38,7 +38,6 @@ #define _LINUX_TIME_H 1 #include <linux/videodev.h> #include <time.h> -#include <strings.h> #include "avdevice.h" typedef struct { |