Browse Source

Merge commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654'

* commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654':
  avformat: utils: K&R formatting cosmetics

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.2-rc1
Michael Niedermayer 12 years ago
parent
commit
896d6a7736
2 changed files with 999 additions and 860 deletions
  1. +1
    -1
      libavformat/internal.h
  2. +998
    -859
      libavformat/utils.c

+ 1
- 1
libavformat/internal.h View File

@@ -28,7 +28,7 @@

/** size of probe buffer, for guessing file type from file contents */
#define PROBE_BUF_MIN 2048
#define PROBE_BUF_MAX (1<<20)
#define PROBE_BUF_MAX (1 << 20)

#ifdef DEBUG
# define hex_dump_debug(class, buf, size) av_hex_dump_log(class, AV_LOG_DEBUG, buf, size)


+ 998
- 859
libavformat/utils.c
File diff suppressed because it is too large
View File


Loading…
Cancel
Save