[FFmpeg-cvslog] Use proper "" quotes for local header #includes
Diego Biurrun
git at videolan.org
Tue Feb 5 17:01:15 CET 2013
ffmpeg | branch: release/1.1 | Diego Biurrun <diego at biurrun.de> | Fri Feb 1 10:27:45 2013 +0100| [0e68b6ddce2945dd367b3d8566dde061b51332af] | committer: Michael Niedermayer
Use proper "" quotes for local header #includes
(cherry picked from commit 6c1a7d07eb41b4cf36e48ebb560fecd9504fd968)
Conflicts:
libavcodec/kbdwin.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e68b6ddce2945dd367b3d8566dde061b51332af
---
libavcodec/arm/videodsp_init_armv5te.c | 2 +-
libavcodec/kbdwin.c | 5 ++---
libavformat/rtp.c | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/libavcodec/arm/videodsp_init_armv5te.c b/libavcodec/arm/videodsp_init_armv5te.c
index c6ca114..d11a070 100644
--- a/libavcodec/arm/videodsp_init_armv5te.c
+++ b/libavcodec/arm/videodsp_init_armv5te.c
@@ -19,7 +19,7 @@
*/
#include "libavutil/arm/cpu.h"
-#include <libavcodec/videodsp.h>
+#include "libavcodec/videodsp.h"
#include "videodsp_arm.h"
void ff_prefetch_arm(uint8_t *mem, ptrdiff_t stride, int h);
diff --git a/libavcodec/kbdwin.c b/libavcodec/kbdwin.c
index 2722312..5a62e9d 100644
--- a/libavcodec/kbdwin.c
+++ b/libavcodec/kbdwin.c
@@ -16,9 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-#include <libavutil/avassert.h>
-#include <libavutil/mathematics.h>
+#include "libavutil/avassert.h"
+#include "libavutil/mathematics.h"
#include "libavutil/attributes.h"
#include "kbdwin.h"
diff --git a/libavformat/rtp.c b/libavformat/rtp.c
index 80e0c7d..c8eebac 100644
--- a/libavformat/rtp.c
+++ b/libavformat/rtp.c
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <libavutil/opt.h>
+#include "libavutil/opt.h"
#include "avformat.h"
#include "rtp.h"
More information about the ffmpeg-cvslog
mailing list