1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00
FFmpeg/libavcodec
Michael Niedermayer 25be63005f Merge commit 'b85a5e87af4254b80913fe33591d96361f30832b'
* commit 'b85a5e87af4254b80913fe33591d96361f30832b':
  lavu: Add av_strnstr()
  h264: Allow discarding the cropping information from SPS

Conflicts:
	Changelog
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-25 14:36:45 +01:00
..
2013-01-23 11:21:09 +00:00
2013-01-21 10:24:45 +00:00
2013-01-23 11:21:09 +00:00
2013-01-14 22:59:05 +01:00
2013-01-14 22:59:05 +01:00
2013-01-09 01:08:39 +01:00
2013-01-14 22:59:05 +01:00
2013-01-21 10:24:45 +00:00
2013-01-21 10:24:45 +00:00
2013-01-22 18:32:56 -08:00
2013-01-23 11:21:09 +00:00
2013-01-23 11:21:09 +00:00
2013-01-25 12:54:15 +00:00
2013-01-14 22:59:05 +01:00
2013-01-22 18:32:56 -08:00
2013-01-22 18:32:56 -08:00
2013-01-23 19:39:42 +01:00
2013-01-23 19:39:42 +01:00
2013-01-24 01:47:20 +01:00
2013-01-14 16:37:12 +01:00
2013-01-10 04:57:50 +01:00
2013-01-12 14:06:30 +01:00
2013-01-12 14:06:30 +01:00
2013-01-22 18:32:56 -08:00
2013-01-22 18:32:56 -08:00
2013-01-24 00:27:59 +01:00
2013-01-14 22:59:05 +01:00
2013-01-14 22:59:05 +01:00
2013-01-14 22:59:05 +01:00
2013-01-14 22:59:05 +01:00
2013-01-14 13:12:49 +02:00
2013-01-14 05:05:39 +01:00
2013-01-23 05:25:04 +01:00
2013-01-16 20:56:14 +00:00
2013-01-24 14:15:55 +01:00