Merge remote-tracking branch 'qatar/master'

* qatar/master:
  log: Only include unistd.h if configure found it
  ape: create audio stream before reading tags.
  mov: make a length variable larger.
  image2: Add "start_number" private option to the demuxer
  image2: Add "start_number" private option to the muxer
  avconv: remove a forgotten debugging printf.
  avconv: use more descriptive names for hardcoded filters.
  avconv: remove redundant handling of async.
  doc/filters: fix typo.
  h264: use asm cabac reader under a generic condition

Conflicts:
	ffmpeg.c
	libavformat/img2dec.c
	libavformat/img2enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 3 insertions, 2 deletions

diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index f962ccf..2844ae0 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -116,7 +116,7 @@ static int find_image_range(int *pfirst_index, int *plast_index,
     int range, last_index, range1, first_index;
 
     /* find the first image */
-    for(first_index = max_start; first_index < max_start + 5; first_index++) {
+    for (first_index = max_start; first_index < max_start + 5; first_index++) {
         if (av_get_frame_filename(buf, sizeof(buf), path, first_index) < 0){
             *pfirst_index =
             *plast_index = 1;
@@ -252,7 +252,8 @@ static int read_header(AVFormatContext *s1)
             last_index = s->globstate.gl_pathc - 1;
 #endif
         } else {
-            if (find_image_range(&first_index, &last_index, s->path, s->start_number - 1) < 0)
+            if (find_image_range(&first_index, &last_index, s->path,
+                                 s->start_number - 1) < 0)
                 return AVERROR(ENOENT);
         }
         s->img_first = first_index;