1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavcodec
Michael Niedermayer 8cc5481d51 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavc: Deprecate the deinterlace functions in libavcodec
  h264: Integrate draw_horiz_band into ff_h264_draw_horiz_band

Conflicts:
	configure
	ffmpeg_opt.c
	libavcodec/avcodec.h
	libavcodec/h264.c
	libavcodec/imgconvert.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-07 11:50:17 +01:00
..
2013-02-21 23:06:30 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 22:11:46 +01:00
2013-03-01 23:18:22 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 10:52:28 +00:00
2013-03-06 10:31:56 +00:00
2013-03-02 20:39:38 +01:00
2013-03-02 19:12:06 +01:00
2013-03-05 03:29:04 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 05:04:39 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 04:06:45 +01:00
2013-03-03 18:40:57 +01:00
2013-02-14 23:45:48 +01:00
2013-03-06 19:28:11 +01:00
2013-03-06 22:11:46 +01:00
2013-02-09 21:21:26 +01:00
2013-03-01 23:18:22 +01:00
2013-03-03 16:50:47 +01:00
2013-03-06 22:11:46 +01:00
2013-03-06 00:38:12 +01:00