diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-29 03:20:29 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-29 03:20:29 +0400 |
| commit | 4dcd1a3145dd93602b86a44ebc07d98ca2a30ab6 (patch) | |
| tree | 694f5d2cba955bc53de20f8fb81cb54439ae5279 /libavformat/mmsh.c | |
| parent | 4b03d960220d15cb915c2c8f15970d2f36f25cd9 (diff) | |
| parent | ac47e014bbaf5163871a8beb7522015e0bc27615 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
adtsenc: Check frame size.
txd: Fix order of operations.
APIchanges: fill in some blanks
timer: fix misspelling of "decicycles"
Eliminate pointless 0/NULL initializers in AVCodec and similar declarations.
indeo3: cosmetics
md5proto: Fix order of operations.
dca: Replace oversized unused get_bits() with skip_bits_long().
Conflicts:
doc/APIchanges
libavformat/mmsh.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mmsh.c')
| -rw-r--r-- | libavformat/mmsh.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/mmsh.c b/libavformat/mmsh.c index 47cfea020b..bc93722f1a 100644 --- a/libavformat/mmsh.c +++ b/libavformat/mmsh.c @@ -406,7 +406,6 @@ URLProtocol ff_mmsh_protocol = { .name = "mmsh", .url_open = mmsh_open, .url_read = mmsh_read, - .url_write = NULL, .url_seek = mmsh_seek, .url_close = mmsh_close, .url_read_seek = mmsh_read_seek, |