Merge commit 'b0633f83f277c05bf1f617a99c7aedd2db8306e3'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jul 2014 18:11:40 +0000 (20:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jul 2014 18:11:40 +0000 (20:11 +0200)
commit0d1994ee3cf879870b202d0cafacc1e5e9348f15
tree8f6c4dadbb74c9d440819c0e42618f714979b547
parent225c5cc8153588d61d65ec1afc1e843425d12785
parentb0633f83f277c05bf1f617a99c7aedd2db8306e3
Merge commit 'b0633f83f277c05bf1f617a99c7aedd2db8306e3'

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

Conflicts:
libavcodec/pafvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile
libavcodec/pafaudio.c
libavcodec/pafvideo.c