diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 09:11:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 09:11:04 +0200 |
| commit | 4390fa6273e603f17a2c7244a5de0d8e36397f59 (patch) | |
| tree | 3010a3ff42df02f266340063659af000174dff0b /libavformat/nut.h | |
| parent | d686517ad113e72b9e434b35598a4a8480d79307 (diff) | |
| parent | d46c588f3cb1963a00e990ceaf4ba9ffa05a716d (diff) | |
| download | ffmpeg-4390fa6273e603f17a2c7244a5de0d8e36397f59.tar.gz | |
Merge commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d'
* commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d':
Remove commented-out #includes
h263dec: Remove broken and disabled debug cruft
vc1: Reindent INIT_LUT(), align backslashes
Conflicts:
libavcodec/vc1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nut.h')
| -rw-r--r-- | libavformat/nut.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavformat/nut.h b/libavformat/nut.h index c60eb35929..dc5af15a57 100644 --- a/libavformat/nut.h +++ b/libavformat/nut.h @@ -22,9 +22,6 @@ #ifndef AVFORMAT_NUT_H #define AVFORMAT_NUT_H -//#include <limits.h> -//#include "libavutil/adler32.h" -//#include "libavcodec/mpegaudio.h" #include "avformat.h" #include "internal.h" #include "metadata.h" |