mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'f046c3b5ac36848cce824b008e0347c621523041'
* commit 'f046c3b5ac36848cce824b008e0347c621523041': lavc: Move deprecation warning disabling to files including the table lavc: Disable deprectation warnings coming from options table Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
3b03186d56
|
@ -33,7 +33,9 @@
|
||||||
#include <float.h> /* FLT_MIN, FLT_MAX */
|
#include <float.h> /* FLT_MIN, FLT_MAX */
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
FF_DISABLE_DEPRECATION_WARNINGS
|
||||||
#include "options_table.h"
|
#include "options_table.h"
|
||||||
|
FF_ENABLE_DEPRECATION_WARNINGS
|
||||||
|
|
||||||
static const char* context_to_name(void* ptr) {
|
static const char* context_to_name(void* ptr) {
|
||||||
AVCodecContext *avc= ptr;
|
AVCodecContext *avc= ptr;
|
||||||
|
|
|
@ -20,6 +20,8 @@
|
||||||
#include "avformat.h"
|
#include "avformat.h"
|
||||||
#include "avio_internal.h"
|
#include "avio_internal.h"
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
|
|
||||||
|
#include "libavutil/internal.h"
|
||||||
#include "libavutil/opt.h"
|
#include "libavutil/opt.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -27,7 +29,9 @@
|
||||||
* Options definition for AVFormatContext.
|
* Options definition for AVFormatContext.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
FF_DISABLE_DEPRECATION_WARNINGS
|
||||||
#include "options_table.h"
|
#include "options_table.h"
|
||||||
|
FF_ENABLE_DEPRECATION_WARNINGS
|
||||||
|
|
||||||
static const char* format_to_name(void* ptr)
|
static const char* format_to_name(void* ptr)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue