mirror of
https://chromium.googlesource.com/libyuv/libyuv
synced 2026-02-11 12:49:52 +08:00
Fix lint error in mjpeg and remove unnecessary includes.
BUG=none TEST=try bots Review URL: https://webrtc-codereview.appspot.com/1078005 git-svn-id: http://libyuv.googlecode.com/svn/trunk@555 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
parent
c861bfbb0e
commit
d7c7bfac57
@ -1,6 +1,6 @@
|
|||||||
Name: libyuv
|
Name: libyuv
|
||||||
URL: http://code.google.com/p/libyuv/
|
URL: http://code.google.com/p/libyuv/
|
||||||
Version: 554
|
Version: 555
|
||||||
License: BSD
|
License: BSD
|
||||||
License File: LICENSE
|
License File: LICENSE
|
||||||
|
|
||||||
|
|||||||
@ -11,6 +11,6 @@
|
|||||||
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
|
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
|
||||||
#define INCLUDE_LIBYUV_VERSION_H_
|
#define INCLUDE_LIBYUV_VERSION_H_
|
||||||
|
|
||||||
#define LIBYUV_VERSION 554
|
#define LIBYUV_VERSION 555
|
||||||
|
|
||||||
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
|
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
|
||||||
|
|||||||
@ -10,16 +10,14 @@
|
|||||||
|
|
||||||
#include "libyuv/convert_argb.h"
|
#include "libyuv/convert_argb.h"
|
||||||
|
|
||||||
#include <string.h> // for memset()
|
|
||||||
|
|
||||||
#include "libyuv/cpu_id.h"
|
#include "libyuv/cpu_id.h"
|
||||||
#include "libyuv/format_conversion.h"
|
#include "libyuv/format_conversion.h"
|
||||||
#ifdef HAVE_JPEG
|
#ifdef HAVE_JPEG
|
||||||
#include "libyuv/mjpeg_decoder.h"
|
#include "libyuv/mjpeg_decoder.h"
|
||||||
#endif
|
#endif
|
||||||
#include "libyuv/rotate_argb.h"
|
#include "libyuv/rotate_argb.h"
|
||||||
#include "libyuv/video_common.h"
|
|
||||||
#include "libyuv/row.h"
|
#include "libyuv/row.h"
|
||||||
|
#include "libyuv/video_common.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
namespace libyuv {
|
namespace libyuv {
|
||||||
|
|||||||
@ -9,24 +9,18 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libyuv/mjpeg_decoder.h"
|
#include "libyuv/mjpeg_decoder.h"
|
||||||
#include "libyuv/planar_functions.h" // For CopyPlane().
|
|
||||||
|
|
||||||
#ifdef HAVE_JPEG
|
#ifdef HAVE_JPEG
|
||||||
// Must be included before jpeglib
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#ifndef __CLR_VER
|
#ifndef __CLR_VER
|
||||||
|
// Must be included before jpeglib.
|
||||||
#include <setjmp.h>
|
#include <setjmp.h>
|
||||||
#define HAVE_SETJMP
|
#define HAVE_SETJMP
|
||||||
#endif
|
#endif
|
||||||
#include <stdio.h>
|
struct FILE; // For jpeglib.h.
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
extern "C" {
|
|
||||||
#include <jpeglib.h>
|
#include <jpeglib.h>
|
||||||
}
|
|
||||||
|
|
||||||
#include <climits>
|
#include "libyuv/planar_functions.h" // For CopyPlane().
|
||||||
#include <cstring>
|
|
||||||
|
|
||||||
namespace libyuv {
|
namespace libyuv {
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
#include "libyuv/row.h"
|
#include "libyuv/row.h"
|
||||||
|
|
||||||
#include <string.h> // For memcpy
|
#include <string.h> // For memcpy and memset.
|
||||||
|
|
||||||
#include "libyuv/basic_types.h"
|
#include "libyuv/basic_types.h"
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user