mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-28 20:53:54 +02:00
2905e3ff64
* qatar/master: lavc: add opt_find to AVCodecContext class. h264: Complexify frame num gap shortening code intreadwrite.h: fix AV_RL32/AV_RB32 signedness. Fix decoding of mpegts streams with h264 video that does *NOT* have b frames Add minor bumps and APIChanges entries for lavf private options. ffmpeg: deprecate -vc and -tvstd ffmpeg: use new avformat_open_* API. ffserver: use new avformat_open_* API. ffprobe: use new avformat_open_* API. ffplay: use new avformat_open_* API. cmdutils: add opt_default2(). dict: add AV_DICT_APPEND flag. lavf: add avformat_write_header() as a replacement for av_write_header(). Deprecate av_open_input_* and remove their uses. lavf: add avformat_open_input() as a replacement for av_open_input_* AVOptions: add av_opt_find() as a replacement for av_find_opt. AVOptions: add av_opt_set_dict() mapping a dictionary struct to a context. ffmpeg: don't abuse a global for passing frame size from input to output ffmpeg: don't abuse a global for passing pixel format from input to output ffmpeg: initialise encoders earlier. Conflicts: cmdutils.c doc/APIchanges ffmpeg.c ffplay.c ffprobe.c libavcodec/h264.c libavformat/avformat.h libavformat/utils.c libavformat/version.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
122 lines
3.5 KiB
C
122 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 <strings.h>
|
|
#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 = key;
|
|
} else
|
|
m->elems[m->count].key = av_strdup(key );
|
|
if (flags & AV_DICT_DONT_STRDUP_VAL) {
|
|
m->elems[m->count].value = 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);
|
|
}
|