virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit 'f046c3b5ac36848cce824b008e0347c621523041'

Browse Source 
* 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:
Michael Niedermayer
2015-07-03 21:40:41 +02:00
parent d563e13a7c f046c3b5ac
commit 3b03186d56
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/options.c
View File

@@ -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;

4
libavformat/options.c
View File

@@ -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)
{ {