Merge commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Dec 2013 18:48:36 +0000 (19:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Dec 2013 18:48:36 +0000 (19:48 +0100)
commit2644df82e6b3610eaf374352ed981bc5d48d2762
tree8cf17a27c511d1b40fab4b227dce021b10e5d227
parent30aa9b727da05d9bf3346ffabdbc983bd5f37616
parentae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a
Merge commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a'

* commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a':
  img2: add stereo 3d still picture file extensions

Conflicts:
libavformat/img2.c

See: 6fe12c7ff2094c68a8b6e9aeea7744ca15594091
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/img2.c