[FFmpeg-devel] [PATCH]lavf/amr: Add amrnb and amrwb demuxers

[Carl Eugen Hoyos]

2017-10-02 23:47 GMT+02:00 Carl Eugen Hoyos <ceffmpeg at gmail.com>:
> 2017-10-02 23:02 GMT+02:00 Michael Niedermayer <michael at niedermayer.cc>:
>> On Sun, Oct 01, 2017 at 06:23:50PM +0200, Carl Eugen Hoyos wrote:
>>> 2017-09-27 18:08 GMT+02:00 Carl Eugen Hoyos <ceffmpeg at gmail.com>:
>>>
>>> > The existing amr demuxer does not allow reading streams,
>>> > it requires the 3GPP-conforming file header.
>>> > Attached patch allows reading amrnb and amrwb from (live)
>>> > streams, fixes ticket #6678.
>>>
>>> New patch with auto-detection attached, passes probecheck.
>>>
>>> Please comment, Carl Eugen
>>
>> breaks mingw64
>>         libavformat/aviobu
>> In file included from src/libavformat/amrnb.c:26:0:
>> src/libavcodec/amrnbdata.h:50:5: error: expected identifier before ‘(’ token
>>      NO_DATA = 15                          ///< no transmission
>>      ^
>> make: *** [libavformat/amrnb.o] Error 1
>> make: *** Waiting for unfinished jobs....
>> STRIP   libavfilter/x86/vf_yadif.o
>> STRIP   libavfilter/x86/vf_removegrain.o
>> In file included from src/libavformat/amrwb.c:26:0:
>> src/libavcodec/amrwbdata.h:64:5: error: expected identifier before ‘(’ token
>>      NO_DATA                                ///< no transmission
>>      ^
>> make: *** [libavformat/amrwb.o] Error 1
>
> The errors are apparently caused by the following definitions in a mingw header:
> #define WSANO_DATA (WSABASEERR + 1004)
> #define NO_DATA WSANO_DATA

Attached is one possible solution.

Please comment, Carl Eugen
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-lavc-amr-Rename-NO_DATA-as-AMR_NO_DATA.patch
Type: text/x-patch
Size: 2583 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20171003/c3a42522/attachment.bin>