[FFmpeg-devel] [PATCH] ADPCM IMA Radical decoder

[Michael Niedermayer]

On Fri, May 03, 2013 at 07:16:42PM -0300, James Almer wrote:
> On 03/05/13 6:50 AM, Paul B Mahol wrote:
> > On 4/23/13, James Almer <jamrial at gmail.com> wrote:
> >> On 23/04/13 6:27 PM, James Almer wrote:
> >>> Signed-off-by: James Almer <jamrial at gmail.com>
> >>> ---
> >>>  libavcodec/Makefile     |  1 +
> >>>  libavcodec/adpcm.c      | 31 +++++++++++++++++++++++++++++++
> >>>  libavcodec/allcodecs.c  |  1 +
> >>>  libavcodec/avcodec.h    |  1 +
> >>>  libavcodec/codec_desc.c |  7 +++++++
> >>>  libavcodec/utils.c      |  2 ++
> >>>  libavcodec/version.h    |  2 +-
> >>>  7 files changed, 44 insertions(+), 1 deletion(-)
> >>
> >> This is another codec supported by the RSD container.
> >> I can either resubmit that one decoder with support for this adpcm codec, or
> >> submit
> >> a separate patch that adds the needed changes.
> >>
> >> Also, to make things simpler since I've have submitted two separate branches
> >>
> >> (THP/RSD/Redspark/IMA_RAD and ADP/DTK, both with conflicting version bumps),
> >> i can
> >> put them in my public repo for merging after they get reviewed.
> >>
> >> Regards.
> > 
> > 
> > This one too LGTM.
> > 
> > You could merge all demuxer/codecs in single brach so that merging is
> > simplier and less work for
> > you and merger when rebasing and fixing conflicts (beacuse of
> > Changelog changes, etc)
> 
> Ok, fixed what you commented in other replies and rebased everything in a 
> single branch called adpcm, so merging should be trivial.

merged

thanks

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

No snowflake in an avalanche ever feels responsible. -- Voltaire
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20130512/1eed74da/attachment.asc>