Michael Niedermayer d0ab71ed11 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  asfdec: cosmetics, reformat ff_asf_parse_packet()
  g.723.1: add missing CODEC_CAP_DR1
  avconv: remove now unneeded calls to avcodec_get_frame_defaults().
  lavc: initialize output AVFrame before decoding.

Conflicts:
	libavformat/asfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-10-24 14:26:13 +02:00

108 KiB

Raw Blame History

View Raw