mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-01-31 20:02:42 +00:00
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master: Remove a superfluous include from libavcodec/options_table.h. Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
0b5f4fdc38
@ -28,7 +28,6 @@
|
||||
#include "libavutil/opt.h"
|
||||
#include "avcodec.h"
|
||||
#include "version.h"
|
||||
#include "config.h"
|
||||
|
||||
#define OFFSET(x) offsetof(AVCodecContext,x)
|
||||
#define DEFAULT 0 //should be NAN but it does not work as it is not a constant in glibc as required by ANSI/ISO C
|
||||
|
Loading…
Reference in New Issue
Block a user