ffmpeg | branch: master | Derek Buitenhuis <derek.buitenh...@gmail.com> | Thu Apr 21 16:04:10 2016 +0100| [32c044cbc64034a9688e3711efe5251998d767b1] | committer: Derek Buitenhuis
Merge commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48' * commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48': testprogs: Clean up #includes Merged-by: Derek Buitenhuis <derek.buitenh...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=32c044cbc64034a9688e3711efe5251998d767b1 --- libavdevice/timefilter.c | 2 +- libavformat/rtmpdh.c | 10 +++++++++- libavformat/rtmpdh.h | 3 ++- libavutil/des.c | 4 +++- libavutil/lls.c | 1 - 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/libavdevice/timefilter.c b/libavdevice/timefilter.c index 9d38f93..a4ae204 100644 --- a/libavdevice/timefilter.c +++ b/libavdevice/timefilter.c @@ -24,7 +24,7 @@ #include "libavutil/common.h" #include "libavutil/mem.h" -#include "config.h" + #include "timefilter.h" struct TimeFilter { diff --git a/libavformat/rtmpdh.c b/libavformat/rtmpdh.c index 42ad72c..c52af9a 100644 --- a/libavformat/rtmpdh.c +++ b/libavformat/rtmpdh.c @@ -26,10 +26,18 @@ * RTMP Diffie-Hellmann utilities */ +#include <stdint.h> +#include <string.h> + #include "config.h" -#include "rtmpdh.h" + +#include "libavutil/attributes.h" +#include "libavutil/error.h" +#include "libavutil/mem.h" #include "libavutil/random_seed.h" +#include "rtmpdh.h" + #define P1024 \ "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1" \ "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" \ diff --git a/libavformat/rtmpdh.h b/libavformat/rtmpdh.h index 95b2620..2b250f5 100644 --- a/libavformat/rtmpdh.h +++ b/libavformat/rtmpdh.h @@ -22,7 +22,8 @@ #ifndef AVFORMAT_RTMPDH_H #define AVFORMAT_RTMPDH_H -#include "avformat.h" +#include <stdint.h> + #include "config.h" #if CONFIG_GMP || CONFIG_GCRYPT diff --git a/libavutil/des.c b/libavutil/des.c index 7198076..ec2c399 100644 --- a/libavutil/des.c +++ b/libavutil/des.c @@ -18,7 +18,9 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <inttypes.h> + +#include <stdint.h> + #include "avutil.h" #include "common.h" #include "intreadwrite.h" diff --git a/libavutil/lls.c b/libavutil/lls.c index 7dd718d..de3d58f 100644 --- a/libavutil/lls.c +++ b/libavutil/lls.c @@ -29,7 +29,6 @@ #include <string.h> #include "attributes.h" -#include "config.h" #include "internal.h" #include "version.h" #include "lls.h" ====================================================================== diff --cc libavutil/des.c index 7198076,2b16b04..ec2c399 --- a/libavutil/des.c +++ b/libavutil/des.c @@@ -15,10 -15,12 +15,12 @@@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - #include <inttypes.h> + + #include <stdint.h> + #include "avutil.h" #include "common.h" #include "intreadwrite.h" _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
