* qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			134 lines
		
	
	
		
			3.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			134 lines
		
	
	
		
			3.7 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 <ctype.h>
 | 
						|
#include <string.h>
 | 
						|
 | 
						|
#include "avstring.h"
 | 
						|
#include "dict.h"
 | 
						|
#include "internal.h"
 | 
						|
#include "mem.h"
 | 
						|
 | 
						|
struct AVDictionary {
 | 
						|
    int count;
 | 
						|
    AVDictionaryEntry *elems;
 | 
						|
};
 | 
						|
 | 
						|
int av_dict_count(const AVDictionary *m)
 | 
						|
{
 | 
						|
    return m ? m->count : 0;
 | 
						|
}
 | 
						|
 | 
						|
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);
 | 
						|
}
 |