FFmpeg/libavformat
Michael Niedermayer 2644df82e6 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>
2013-12-12 19:48:36 +01:00
..
2013-10-13 20:13:38 +00:00
2013-10-13 20:13:38 +00:00
2013-10-18 19:53:47 +02:00
2013-10-18 19:53:47 +02:00
2013-12-01 12:03:34 +01:00
2013-10-13 20:13:38 +00:00
2013-11-10 13:25:35 +01:00
2013-10-13 20:13:38 +00:00
2013-10-13 20:13:38 +00:00
2013-10-06 19:36:53 +02:00
2013-10-13 20:13:38 +00:00
2013-10-13 20:13:38 +00:00
2013-10-28 23:54:42 +01:00
2013-12-12 18:41:39 +01:00
2013-11-22 23:52:08 +01:00
2013-10-13 20:13:38 +00:00
2013-09-21 03:26:54 +02:00
2013-10-31 20:20:49 +01:00
2013-12-09 14:24:46 +01:00
2013-10-23 11:17:03 +03:00
2013-11-09 01:45:24 +01:00
2013-09-21 15:36:33 +02:00
2013-10-13 20:13:38 +00:00
2013-10-13 20:13:38 +00:00
2013-10-13 20:13:38 +00:00
2013-11-29 14:19:47 +01:00
2013-11-13 22:56:18 +01:00
2013-10-22 17:09:56 +01:00
2013-10-22 17:09:56 +01:00
2013-10-22 17:09:56 +01:00
2013-10-13 20:13:38 +00:00
2013-12-01 12:03:34 +01:00
2013-12-11 13:15:49 +01:00
2013-10-13 20:13:38 +00:00
2013-11-26 08:31:10 +01:00
2013-10-13 20:13:38 +00:00
2013-10-25 19:14:36 +02:00
2013-09-21 15:36:33 +02:00
2013-10-13 20:13:38 +00:00
2013-11-06 12:56:42 +01:00
2013-10-13 20:13:38 +00:00
2013-10-13 20:13:38 +00:00
2013-10-21 17:32:01 +02:00
2013-10-13 20:13:38 +00:00
2013-10-13 20:13:38 +00:00
2013-12-01 12:03:34 +01:00
2013-10-13 20:13:38 +00:00
2013-10-13 20:13:38 +00:00
2013-09-21 15:36:33 +02:00