eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-06 22:25:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'a75c2eb25a62105c09b48521aef429dc8a231637'

Browse Source 
* commit 'a75c2eb25a62105c09b48521aef429dc8a231637':
  lavc: make rc_eq into private options of mpegvideo encoders

Conflicts:
	libavcodec/options_table.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-10-18 14:06:15 +02:00
parent 17a065cf20 a75c2eb25a
commit ec8f56efad
6 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/options.c
View File

@@ -27,6 +27,7 @@
#include "avcodec.h"
#include "internal.h"
#include "libavutil/avassert.h"
#include "libavutil/internal.h"
#include "libavutil/mem.h"
#include "libavutil/opt.h"
#include <float.h> /* FLT_MIN, FLT_MAX */
@@ -200,17 +201,21 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
dest->internal = NULL;
/* reallocate values that should be allocated separately */
dest->rc_eq = NULL;
dest->extradata = NULL;
dest->intra_matrix = NULL;
dest->inter_matrix = NULL;
dest->rc_override = NULL;
dest->subtitle_header = NULL;
#if FF_API_MPV_OPT
FF_DISABLE_DEPRECATION_WARNINGS
dest->rc_eq = NULL;
if (src->rc_eq) {
dest->rc_eq = av_strdup(src->rc_eq);
if (!dest->rc_eq)
return AVERROR(ENOMEM);
}
FF_ENABLE_DEPRECATION_WARNINGS
#endif
#define alloc_and_copy_or_fail(obj, size, pad) \
if (src->obj && size > 0) { \
@@ -237,7 +242,11 @@ fail:
av_freep(&dest->intra_matrix);
av_freep(&dest->inter_matrix);
av_freep(&dest->extradata);
#if FF_API_MPV_OPT
FF_DISABLE_DEPRECATION_WARNINGS
av_freep(&dest->rc_eq);
FF_ENABLE_DEPRECATION_WARNINGS
#endif
return AVERROR(ENOMEM);
}