1
111
Merge branch 'master' of https://github.com/BradLarson/GPUImage
Merge branch 'master' of https://github.com/BradLarson/GPUImage
Merge branch 'master' of https://github.com/BradLarson/GPUImage
Merge branch 'master' of https://github.com/BradLarson/GPUImage
Merge branch 'master' of https://github.com/BradLarson/GPUImage
Merge branch 'master' of https://github.com/BradLarson/GPUImage

# By Sean Meiners (11) and others
# Via Brad Larson (10) and Sean Meiners (1)
* 'master' of https://github.com/BradLarson/GPUImage: (28 commits)
  I believe this fixes a crash on iOS 4.x, due to a missing GCD function on that OS.
  Added kGPUImageRotateRightFlipHorizontal to the GPUImageRotationMode enum to fix build errors
  Fixed two precision issues with the levels and lookup filters.
  GPUImageMovieWriter: synchronise finishRecording with the movieWritingQueue
  moved header file back into project scope
  Removed -prepareForImageCapture from the imageByFilterinfImage convenience method, because of how people were misusing this.
  Reset framework minimum deployment target to 4.0 from 6.0.
  GPUImageVideoCamera: nil ivars are removing inputs and outputs
  GPUImageVideoCamera: begin & commit configuration when removing inputs and outputs
  GPUImageVideoCamera: Add -(BOOL)addAudioInputsAndOutputs and -(BOOL)removeAudioInputsAndOutputs to manage audio inputs independent of audioEncodingTarget
  Allowing the movie writer to be paused when in callback sync mode. This is primarily useful when the app is going to the background and you're rendering in non-real-time. Fixing an issue where the write loop would keep retrying even when the writer had been canceled.
  Fixes issue when building documentation with spaces in the project directory path.
  Change delegate to call back in end processing
  Notify delegate that play has finished in more cases
  Moving target to iOS 6 so weak references will work as expected.
  Lots going on here, but there was no logical way to separate it into smaller changes.
  Don't enable the audio track if it's already enabled. It can cause the system to have two AVAssetWriters for audio going at once.
  Update the view geometry on frame changes so we don't end up stretching the image if our view gets animated.
  Re-working GPUImageVideoCamera to use the YUV->RGB transform method shown in Apple's AVBasicVideoOutput example because it produces results closer to that of the built-in camera. Making GPUImageMovie do the YUV->RGB conversion via shader rather than asking AVFoundation to do it.
  Allow for chaining the output image size.
  ...
Merge branch 'master' of https://github.com/k06a/GPUImage