Merge commit 'ede2b451ccb1b2317858c7a32784a9b739ba45f4'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 23:26:46 +0000 (00:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 23:26:46 +0000 (00:26 +0100)
commit3bf5c05925b53a02e59fd8f74df8947731411216
tree3dbdd89dd3fd96e5cb1c7380e289277327529382
parent0dd4eff588c59d0c1412eb4a907004017e76badd
parentede2b451ccb1b2317858c7a32784a9b739ba45f4
Merge commit 'ede2b451ccb1b2317858c7a32784a9b739ba45f4'

* commit 'ede2b451ccb1b2317858c7a32784a9b739ba45f4':
  build: Sort h264 objects

Conflicts:
libavcodec/Makefile

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