* 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>
		
			
				
	
	
		
			121 lines
		
	
	
		
			3.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			121 lines
		
	
	
		
			3.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * copyright (c) 2009 Michael Niedermayer
 | 
						|
 *
 | 
						|
 * This file is part of FFmpeg.
 | 
						|
 *
 | 
						|
 * FFmpeg is free software; you can redistribute it and/or
 | 
						|
 * modify it under the terms of the GNU Lesser General Public
 | 
						|
 * License as published by the Free Software Foundation; either
 | 
						|
 * version 2.1 of the License, or (at your option) any later version.
 | 
						|
 *
 | 
						|
 * FFmpeg is distributed in the hope that it will be useful,
 | 
						|
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | 
						|
 * Lesser General Public License for more details.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU Lesser General Public
 | 
						|
 * License along with FFmpeg; if not, write to the Free Software
 | 
						|
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 | 
						|
 */
 | 
						|
 | 
						|
#include "avstring.h"
 | 
						|
#include "dict.h"
 | 
						|
#include "internal.h"
 | 
						|
#include "mem.h"
 | 
						|
 | 
						|
AVDictionaryEntry *
 | 
						|
av_dict_get(AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags)
 | 
						|
{
 | 
						|
    unsigned int i, j;
 | 
						|
 | 
						|
    if(!m)
 | 
						|
        return NULL;
 | 
						|
 | 
						|
    if(prev) i= prev - m->elems + 1;
 | 
						|
    else     i= 0;
 | 
						|
 | 
						|
    for(; i<m->count; i++){
 | 
						|
        const char *s= m->elems[i].key;
 | 
						|
        if(flags & AV_DICT_MATCH_CASE) for(j=0;         s[j]  ==         key[j]  && key[j]; j++);
 | 
						|
        else                               for(j=0; toupper(s[j]) == toupper(key[j]) && key[j]; j++);
 | 
						|
        if(key[j])
 | 
						|
            continue;
 | 
						|
        if(s[j] && !(flags & AV_DICT_IGNORE_SUFFIX))
 | 
						|
            continue;
 | 
						|
        return &m->elems[i];
 | 
						|
    }
 | 
						|
    return NULL;
 | 
						|
}
 | 
						|
 | 
						|
int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags)
 | 
						|
{
 | 
						|
    AVDictionary      *m = *pm;
 | 
						|
    AVDictionaryEntry *tag = av_dict_get(m, key, NULL, flags);
 | 
						|
    char *oldval = NULL;
 | 
						|
 | 
						|
    if(!m)
 | 
						|
        m = *pm = av_mallocz(sizeof(*m));
 | 
						|
 | 
						|
    if(tag) {
 | 
						|
        if (flags & AV_DICT_DONT_OVERWRITE)
 | 
						|
            return 0;
 | 
						|
        if (flags & AV_DICT_APPEND)
 | 
						|
            oldval = tag->value;
 | 
						|
        else
 | 
						|
            av_free(tag->value);
 | 
						|
        av_free(tag->key);
 | 
						|
        *tag = m->elems[--m->count];
 | 
						|
    } else {
 | 
						|
        AVDictionaryEntry *tmp = av_realloc(m->elems, (m->count+1) * sizeof(*m->elems));
 | 
						|
        if(tmp) {
 | 
						|
            m->elems = tmp;
 | 
						|
        } else
 | 
						|
            return AVERROR(ENOMEM);
 | 
						|
    }
 | 
						|
    if (value) {
 | 
						|
        if (flags & AV_DICT_DONT_STRDUP_KEY) {
 | 
						|
            m->elems[m->count].key   = (char*)(intptr_t)key;
 | 
						|
        } else
 | 
						|
        m->elems[m->count].key  = av_strdup(key  );
 | 
						|
        if (flags & AV_DICT_DONT_STRDUP_VAL) {
 | 
						|
            m->elems[m->count].value = (char*)(intptr_t)value;
 | 
						|
        } else if (oldval && flags & AV_DICT_APPEND) {
 | 
						|
            int len = strlen(oldval) + strlen(value) + 1;
 | 
						|
            if (!(oldval = av_realloc(oldval, len)))
 | 
						|
                return AVERROR(ENOMEM);
 | 
						|
            av_strlcat(oldval, value, len);
 | 
						|
            m->elems[m->count].value = oldval;
 | 
						|
        } else
 | 
						|
            m->elems[m->count].value = av_strdup(value);
 | 
						|
        m->count++;
 | 
						|
    }
 | 
						|
    if (!m->count) {
 | 
						|
        av_free(m->elems);
 | 
						|
        av_freep(pm);
 | 
						|
    }
 | 
						|
 | 
						|
    return 0;
 | 
						|
}
 | 
						|
 | 
						|
void av_dict_free(AVDictionary **pm)
 | 
						|
{
 | 
						|
    AVDictionary *m = *pm;
 | 
						|
 | 
						|
    if (m) {
 | 
						|
        while(m->count--) {
 | 
						|
            av_free(m->elems[m->count].key);
 | 
						|
            av_free(m->elems[m->count].value);
 | 
						|
        }
 | 
						|
        av_free(m->elems);
 | 
						|
    }
 | 
						|
    av_freep(pm);
 | 
						|
}
 | 
						|
 | 
						|
void av_dict_copy(AVDictionary **dst, AVDictionary *src, int flags)
 | 
						|
{
 | 
						|
    AVDictionaryEntry *t = NULL;
 | 
						|
 | 
						|
    while ((t = av_dict_get(src, "", t, AV_DICT_IGNORE_SUFFIX)))
 | 
						|
        av_dict_set(dst, t->key, t->value, flags);
 | 
						|
}
 |