[FFmpeg-cvslog] Merge commit 'b0633f83f277c05bf1f617a99c7aedd2db8306e3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul  6 20:11:40 2014 +0200| [0d1994ee3cf879870b202d0cafacc1e5e9348f15] | committer: Michael Niedermayer

Merge commit 'b0633f83f277c05bf1f617a99c7aedd2db8306e3'

* commit 'b0633f83f277c05bf1f617a99c7aedd2db8306e3':
  paf: split audio and video decoder

Conflicts:
	libavcodec/pafvideo.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0d1994ee3cf879870b202d0cafacc1e5e9348f15
---