FFmpeg/libavcodec/gsmdec_data.h at 2ece7d94bc35ba0ee2b650caec25853b9fcc2eb7

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-03-13 09:00:40 +08:00

Files

Michael Niedermayer 5459cf4114 Merge commit 'a8ea936a0a00570f61a16a588821b52f6a3115c2'

* commit 'a8ea936a0a00570f61a16a588821b52f6a3115c2':
  libilbc: decode directly to the user-provided AVFrame
  dpcm: decode directly to the user-provided AVFrame
  imc/iac: decode directly to the user-provided AVFrame
  gsm: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/dpcm.c

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

2013-02-13 12:05:00 +01:00

1.4 KiB

Raw Blame History

View Raw

1.4 KiB Raw Blame History

1.4 KiB

Raw Blame History