1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
FFmpeg/libavcodec
Michael Niedermayer 0269b30fef Merge remote-tracking branch 'qatar/master'
* qatar/master:
  mpegvideo_enc: Don't call ff_h263dsp_init unconditionally

Conflicts:
	libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-22 23:36:33 +01:00
..
2014-01-22 14:41:24 +01:00
2014-01-09 19:33:07 +01:00
2014-01-21 11:57:43 +01:00
2014-01-21 11:58:52 +01:00
2014-01-22 14:41:24 +01:00
2014-01-10 17:08:04 +01:00
2014-01-10 17:51:13 +01:00
2014-01-22 14:41:24 +01:00
2014-01-19 22:26:43 +01:00