July 2011 - ffmpeg-cvslog - lists.ffmpeg.org

avfiltergraph: change the syntax of avfilter_graph_parse()
by git＠videolan.org 18 May '12

18 May '12

ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala(a)poste.it> | Sat Jun 11 15:16:02 2011 +0200| [6119b23a3662d1e106cdf69ef3171b2e7e1d495c] | committer: Stefano Sabatini avfiltergraph: change the syntax of avfilter_graph_parse() Make it returns the list of open inputs and outputs, so it can be reused by applications. Breaks API/ABI. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6119b23a3662d1e10… --- doc/APIchanges | 3 +++ ffmpeg.c | 2 +- ffplay.c | 2 +- libavfilter/avfilter.h | 4 ++-- libavfilter/avfiltergraph.h | 8 +++++--- libavfilter/graphparser.c | 20 ++++++++++---------- 6 files changed, 22 insertions(+), 17 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 592c268..40efee8 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,9 @@ libavutil: 2011-04-18 API changes, most recent first: +2011-06-12 - xxxxxxx - lavfi 2.16.0 - avfilter_graph_parse() + Change avfilter_graph_parse() signature. + 2011-06-xx - xxxxxxx - lavu 51.6.0 - opt.h Add av_opt_flag_is_set(). diff --git a/ffmpeg.c b/ffmpeg.c index 35395a9..f69c054 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -418,7 +418,7 @@ static int configure_video_filters(AVInputStream *ist, AVOutputStream *ost) inputs->pad_idx = 0; inputs->next = NULL; - if ((ret = avfilter_graph_parse(ost->graph, ost->avfilter, inputs, outputs, NULL)) < 0) + if ((ret = avfilter_graph_parse(ost->graph, ost->avfilter, &inputs, &outputs, NULL)) < 0) return ret; av_freep(&ost->avfilter); } else { diff --git a/ffplay.c b/ffplay.c index ebe9e05..c5f5f75 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1708,7 +1708,7 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c inputs->pad_idx = 0; inputs->next = NULL; - if ((ret = avfilter_graph_parse(graph, vfilters, inputs, outputs, NULL)) < 0) + if ((ret = avfilter_graph_parse(graph, vfilters, &inputs, &outputs, NULL)) < 0) goto the_end; av_freep(&vfilters); } else { diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 64d76cc..fbd1dc4 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -26,8 +26,8 @@ #include "libavutil/samplefmt.h" #define LIBAVFILTER_VERSION_MAJOR 2 -#define LIBAVFILTER_VERSION_MINOR 15 -#define LIBAVFILTER_VERSION_MICRO 1 +#define LIBAVFILTER_VERSION_MINOR 16 +#define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h index 23a7c51..538fd2c 100644 --- a/libavfilter/avfiltergraph.h +++ b/libavfilter/avfiltergraph.h @@ -112,12 +112,14 @@ typedef struct AVFilterInOut { * * @param graph the filter graph where to link the parsed graph context * @param filters string to be parsed - * @param inputs linked list to the inputs of the graph - * @param outputs linked list to the outputs of the graph + * @param inputs linked list to the inputs of the graph, may be NULL. + * It is updated to contain the list of open inputs after the parsing. + * @param outputs linked list to the outputs of the graph, may be NULL. + * It is updated to contain the list of open outputs after the parsing. * @return zero on success, a negative AVERROR code on error */ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, - AVFilterInOut *inputs, AVFilterInOut *outputs, + AVFilterInOut **inputs, AVFilterInOut **outputs, void *log_ctx); #endif /* AVFILTER_AVFILTERGRAPH_H */ diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index aa1f228..ea0c5dd 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -328,8 +328,8 @@ static int parse_outputs(const char **buf, AVFilterInOut **curr_inputs, } int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, - AVFilterInOut *open_inputs, - AVFilterInOut *open_outputs, void *log_ctx) + AVFilterInOut **open_inputs, AVFilterInOut **open_outputs, + void *log_ctx) { int index = 0, ret; char chr = 0; @@ -341,7 +341,7 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, const char *filterchain = filters; filters += strspn(filters, WHITESPACES); - if ((ret = parse_inputs(&filters, &curr_inputs, &open_outputs, log_ctx)) < 0) + if ((ret = parse_inputs(&filters, &curr_inputs, open_outputs, log_ctx)) < 0) goto fail; if ((ret = parse_filter(&filter, &filters, graph, index, log_ctx)) < 0) @@ -350,14 +350,14 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, if (filter->input_count == 1 && !curr_inputs && !index) { /* First input can be omitted if it is "[in]" */ const char *tmp = "[in]"; - if ((ret = parse_inputs(&tmp, &curr_inputs, &open_outputs, log_ctx)) < 0) + if ((ret = parse_inputs(&tmp, &curr_inputs, open_outputs, log_ctx)) < 0) goto fail; } - if ((ret = link_filter_inouts(filter, &curr_inputs, &open_inputs, log_ctx)) < 0) + if ((ret = link_filter_inouts(filter, &curr_inputs, open_inputs, log_ctx)) < 0) goto fail; - if ((ret = parse_outputs(&filters, &curr_inputs, &open_inputs, &open_outputs, + if ((ret = parse_outputs(&filters, &curr_inputs, open_inputs, open_outputs, log_ctx)) < 0) goto fail; @@ -382,10 +382,10 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, goto fail; } - if (open_inputs && !strcmp(open_inputs->name, "out") && curr_inputs) { + if (*open_inputs && !strcmp((*open_inputs)->name, "out") && curr_inputs) { /* Last output can be omitted if it is "[out]" */ const char *tmp = "[out]"; - if ((ret = parse_outputs(&tmp, &curr_inputs, &open_inputs, &open_outputs, + if ((ret = parse_outputs(&tmp, &curr_inputs, open_inputs, open_outputs, log_ctx)) < 0) goto fail; } @@ -396,8 +396,8 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, for (; graph->filter_count > 0; graph->filter_count--) avfilter_free(graph->filters[graph->filter_count - 1]); av_freep(&graph->filters); - free_inout(open_inputs); - free_inout(open_outputs); + free_inout(*open_inputs); + free_inout(*open_outputs); free_inout(curr_inputs); return ret; }

2 1

Remove non-existing fourcc " Y8".
by git＠videolan.org 31 Jul '11

31 Jul '11

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Mon Aug 1 01:26:55 2011 +0200| [318fd9dac2d76765b2ac68338fdedb5809bf09e6] | committer: Carl Eugen Hoyos Remove non-existing fourcc " Y8". This reverts a line of r1842. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=318fd9dac2d76765b… --- libavcodec/raw.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/libavcodec/raw.c b/libavcodec/raw.c index e87a9af..a26dea8 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -45,7 +45,6 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = { { PIX_FMT_YUVJ422P, MKTAG('Y', '4', '2', 'B') }, { PIX_FMT_YUVJ422P, MKTAG('P', '4', '2', '2') }, { PIX_FMT_GRAY8, MKTAG('Y', '8', '0', '0') }, - { PIX_FMT_GRAY8, MKTAG(' ', ' ', 'Y', '8') }, { PIX_FMT_GRAY8, MKTAG('Y', '8', ' ', ' ') }, { PIX_FMT_YUYV422, MKTAG('Y', 'U', 'Y', '2') }, /* Packed formats */

1 0

Support FourCC DreX as MPEG4 ASP.
by git＠videolan.org 31 Jul '11

31 Jul '11

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Mon Aug 1 01:23:39 2011 +0200| [1c5480651efa7cb2dbec9309e1c6938f9c85fd53] | committer: Carl Eugen Hoyos Support FourCC DreX as MPEG4 ASP. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1c5480651efa7cb2d… --- libavformat/riff.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libavformat/riff.c b/libavformat/riff.c index 37c292e..636d05c 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -87,6 +87,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'V') }, { CODEC_ID_MPEG4, MKTAG('S', 'I', 'P', 'P') }, /* Samsung SHR-6040 */ { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'X') }, + { CODEC_ID_MPEG4, MKTAG('D', 'r', 'e', 'X') }, { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') }, { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') }, { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', 'G', '3') },

1 0

Rm lavfi-showfiltfmts on make testclean.
by git＠videolan.org 31 Jul '11

31 Jul '11

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Mon Aug 1 00:55:40 2011 +0200| [b36bd27fbeaadcf265c0851643833f6847af02a0] | committer: Carl Eugen Hoyos Rm lavfi-showfiltfmts on make testclean. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b36bd27fbeaadcf26… --- tests/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 0a9e402..34094da 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -103,7 +103,7 @@ fate-list: clean:: testclean testclean: - $(RM) -r tests/vsynth1 tests/vsynth2 tests/data + $(RM) -r tests/vsynth1 tests/vsynth2 tests/data tools/lavfi-showfiltfmts$(EXESUF) $(RM) $(CLEANSUFFIXES:%=tests/%) $(RM) $(TESTTOOLS:%=tests/%$(HOSTEXESUF))

1 0

Unbreak ffplay -s and ffplay -pix_fmt.
by git＠videolan.org 31 Jul '11

31 Jul '11

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Mon Aug 1 00:40:28 2011 +0200| [940a116b1f441b90e49886bfc07e0137ae342d5a] | committer: Carl Eugen Hoyos Unbreak ffplay -s and ffplay -pix_fmt. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=940a116b1f441b90e… --- doc/ffplay.texi | 9 +++++---- ffplay.c | 10 ++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/doc/ffplay.texi b/doc/ffplay.texi index 44fbad1..9390e14 100644 --- a/doc/ffplay.texi +++ b/doc/ffplay.texi @@ -38,8 +38,9 @@ Force displayed width. @item -y @var{height} Force displayed height. @item -s @var{size} -This option has been removed. Use private format options for specifying the -input video size. +Set frame size (WxH or abbreviation), needed for videos which do +not contain a header with the frame size like raw YUV. This option +has been deprecated in favor of private options, try -video_size. @item -an Disable audio. @item -vn @@ -89,8 +90,8 @@ Read @var{input_file}. @section Advanced options @table @option @item -pix_fmt @var{format} -This option has been removed. Use private options for specifying the -input pixel format. +Set pixel format. +This option has been deprecated in favor of private options, try -pixel_format. @item -stats Show the stream duration, the codec parameters, the current position in the stream and the audio/video synchronisation drift. diff --git a/ffplay.c b/ffplay.c index eb9d81b..ed1bdf4 100644 --- a/ffplay.c +++ b/ffplay.c @@ -2811,9 +2811,8 @@ static void event_loop(void) static int opt_frame_size(const char *opt, const char *arg) { - av_log(NULL, AV_LOG_ERROR, - "Option '%s' has been removed, use private format options instead\n", opt); - return AVERROR(EINVAL); + av_log(NULL, AV_LOG_WARNING, "Option -s is deprecated, use -video_size.\n"); + return opt_default("video_size", arg); } static int opt_width(const char *opt, const char *arg) @@ -2840,9 +2839,8 @@ static int opt_format(const char *opt, const char *arg) static int opt_frame_pix_fmt(const char *opt, const char *arg) { - av_log(NULL, AV_LOG_ERROR, - "Option '%s' has been removed, use private format options instead\n", opt); - return AVERROR(EINVAL); + av_log(NULL, AV_LOG_WARNING, "Option -pix_fmt is deprecated, use -pixel_format.\n"); + return opt_default("pixel_format", arg); } static int opt_sync(const char *opt, const char *arg)

1 0

Do not ignore opt_default() return values.
by git＠videolan.org 31 Jul '11

31 Jul '11

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Mon Aug 1 00:36:52 2011 +0200| [8460b757c2c20b57d1dd1c1989086f942a261b4b] | committer: Carl Eugen Hoyos Do not ignore opt_default() return values. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8460b757c2c20b57d… --- ffmpeg.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index cc8fdd2..2a1ee79 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -3030,8 +3030,7 @@ static int opt_qscale(const char *opt, const char *arg) static int opt_top_field_first(const char *opt, const char *arg) { top_field_first = parse_number_or_die(opt, arg, OPT_INT, 0, 1); - opt_default(opt, arg); - return 0; + return opt_default(opt, arg); } static int opt_thread_count(const char *opt, const char *arg) @@ -3077,15 +3076,13 @@ static int opt_audio_channels(const char *opt, const char *arg) static int opt_video_channel(const char *opt, const char *arg) { av_log(NULL, AV_LOG_WARNING, "This option is deprecated, use -channel.\n"); - opt_default("channel", arg); - return 0; + return opt_default("channel", arg); } static int opt_video_standard(const char *opt, const char *arg) { av_log(NULL, AV_LOG_WARNING, "This option is deprecated, use -standard.\n"); - opt_default("standard", arg); - return 0; + return opt_default("standard", arg); } static int opt_codec(const char *opt, const char *arg) @@ -4379,8 +4376,7 @@ static void log_callback_null(void* ptr, int level, const char* fmt, va_list vl) static int opt_passlogfile(const char *opt, const char *arg) { pass_logfilename_prefix = arg; - opt_default("passlogfile", arg); - return 0; + return opt_default("passlogfile", arg); } static const OptionDef options[] = {

1 0

Cosmetics: Restore alphabetical order.
by git＠videolan.org 31 Jul '11

31 Jul '11

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Mon Aug 1 00:33:09 2011 +0200| [222b333ed5dfce06583940793cc4890cc342fe9f] | committer: Carl Eugen Hoyos Cosmetics: Restore alphabetical order. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=222b333ed5dfce065… --- libavformat/caf.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/caf.c b/libavformat/caf.c index ce0d19b..0545330 100644 --- a/libavformat/caf.c +++ b/libavformat/caf.c @@ -34,22 +34,22 @@ const AVCodecTag ff_codec_caf_tags[] = { { CODEC_ID_AAC, MKTAG('a','a','c',' ') }, { CODEC_ID_AC3, MKTAG('a','c','-','3') }, - { CODEC_ID_ALAC, MKTAG('a','l','a','c') }, - /* FIXME: use DV demuxer, as done in MOV */ - /*{ CODEC_ID_DVAUDIO, MKTAG('v','d','v','a') },*/ - /*{ CODEC_ID_DVAUDIO, MKTAG('d','v','c','a') },*/ { CODEC_ID_ADPCM_IMA_QT, MKTAG('i','m','a','4') }, { CODEC_ID_ADPCM_IMA_WAV, MKTAG('m','s', 0, 17 ) }, { CODEC_ID_ADPCM_MS, MKTAG('m','s', 0, 2 ) }, + { CODEC_ID_ALAC, MKTAG('a','l','a','c') }, { CODEC_ID_AMR_NB, MKTAG('s','a','m','r') }, + /* FIXME: use DV demuxer, as done in MOV */ + /*{ CODEC_ID_DVAUDIO, MKTAG('v','d','v','a') },*/ + /*{ CODEC_ID_DVAUDIO, MKTAG('d','v','c','a') },*/ { CODEC_ID_GSM, MKTAG('a','g','s','m') }, { CODEC_ID_GSM_MS, MKTAG('m','s', 0, '1') }, { CODEC_ID_MACE3, MKTAG('M','A','C','3') }, { CODEC_ID_MACE6, MKTAG('M','A','C','6') }, + { CODEC_ID_MP1, MKTAG('.','m','p','1') }, + { CODEC_ID_MP2, MKTAG('.','m','p','2') }, { CODEC_ID_MP3, MKTAG('.','m','p','3') }, { CODEC_ID_MP3, MKTAG('m','s', 0 ,'U') }, - { CODEC_ID_MP2, MKTAG('.','m','p','2') }, - { CODEC_ID_MP1, MKTAG('.','m','p','1') }, { CODEC_ID_PCM_ALAW, MKTAG('a','l','a','w') }, { CODEC_ID_PCM_MULAW, MKTAG('u','l','a','w') }, { CODEC_ID_QCELP, MKTAG('Q','c','l','p') },

1 0

Support muxing MP1, MP2 and MP3 in caf.
by git＠videolan.org 31 Jul '11

31 Jul '11

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Mon Aug 1 00:30:56 2011 +0200| [9b60b076fb9ab5b39997f3969ac769c03d6abeaf] | committer: Carl Eugen Hoyos Support muxing MP1, MP2 and MP3 in caf. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b60b076fb9ab5b39… --- libavformat/cafenc.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 43 insertions(+), 3 deletions(-) diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c index 29b1d56..1c77251 100644 --- a/libavformat/cafenc.c +++ b/libavformat/cafenc.c @@ -28,6 +28,10 @@ typedef struct { int64_t data; + uint8_t *pkt_sizes; + int size_buffer_size; + int size_entries_used; + int packets; } CAFContext; static uint32_t codec_flags(enum CodecID codec_id) { @@ -133,9 +137,9 @@ static int caf_write_header(AVFormatContext *s) return AVERROR_INVALIDDATA; } - if (!enc->block_align) { - av_log(s, AV_LOG_ERROR, "muxing with unknown or variable packet size not yet supported\n"); - return AVERROR_PATCHWELCOME; + if (!enc->block_align && !pb->seekable) { + av_log(s, AV_LOG_ERROR, "Muxing variable packet size not supported on non seekable output\n"); + return AVERROR_INVALIDDATA; } ffio_wfourcc(pb, "caff"); //< mFileType @@ -169,13 +173,38 @@ static int caf_write_header(AVFormatContext *s) static int caf_write_packet(AVFormatContext *s, AVPacket *pkt) { + CAFContext *caf = s->priv_data; + avio_write(s->pb, pkt->data, pkt->size); + if (!s->streams[0]->codec->block_align) { + void *pkt_sizes = caf->pkt_sizes; + int i, alloc_size = caf->size_entries_used + 5; + if (alloc_size < 0) { + caf->pkt_sizes = NULL; + } else { + caf->pkt_sizes = av_fast_realloc(caf->pkt_sizes, + &caf->size_buffer_size, + alloc_size); + } + if (!caf->pkt_sizes) { + av_free(pkt_sizes); + return AVERROR(ENOMEM); + } + for (i = 4; i > 0; i--) { + unsigned top = pkt->size >> i * 7; + if (top) + caf->pkt_sizes[caf->size_entries_used++] = 128 | top; + } + caf->pkt_sizes[caf->size_entries_used++] = pkt->size & 127; + caf->packets++; + } return 0; } static int caf_write_trailer(AVFormatContext *s) { AVIOContext *pb = s->pb; + AVCodecContext *enc = s->streams[0]->codec; if (pb->seekable) { CAFContext *caf = s->priv_data; @@ -184,6 +213,17 @@ static int caf_write_trailer(AVFormatContext *s) avio_seek(pb, caf->data, SEEK_SET); avio_wb64(pb, file_size - caf->data - 8); avio_seek(pb, file_size, SEEK_SET); + if (!enc->block_align) { + ffio_wfourcc(pb, "pakt"); + avio_wb64(pb, caf->size_entries_used + 24); + avio_wb64(pb, caf->packets); ///< mNumberPackets + avio_wb64(pb, caf->packets * samples_per_packet(enc->codec_id, enc->channels)); ///< mNumberValidFrames + avio_wb32(pb, 0); ///< mPrimingFrames + avio_wb32(pb, 0); ///< mRemainderFrames + avio_write(pb, caf->pkt_sizes, caf->size_entries_used); + av_freep(&caf->pkt_sizes); + caf->size_buffer_size = 0; + } avio_flush(pb); } return 0;

1 0

Explicitely fail for unsupported codecs when muxing caf.
by git＠videolan.org 31 Jul '11

31 Jul '11

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Mon Aug 1 00:28:04 2011 +0200| [c6e0332f3062efb00a8c577e11aee70821874b2e] | committer: Carl Eugen Hoyos Explicitely fail for unsupported codecs when muxing caf. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c6e0332f3062efb00… --- libavformat/cafenc.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c index 2d64bec..29b1d56 100644 --- a/libavformat/cafenc.c +++ b/libavformat/cafenc.c @@ -101,6 +101,17 @@ static int caf_write_header(AVFormatContext *s) unsigned int codec_tag = ff_codec_get_tag(ff_codec_caf_tags, enc->codec_id); switch (enc->codec_id) { + case CODEC_ID_AAC: + case CODEC_ID_AC3: + case CODEC_ID_ALAC: + case CODEC_ID_AMR_NB: + case CODEC_ID_QCELP: + case CODEC_ID_QDM2: + av_log(s, AV_LOG_ERROR, "muxing codec currently unsupported\n"); + return AVERROR_PATCHWELCOME; + } + + switch (enc->codec_id) { case CODEC_ID_PCM_S8: case CODEC_ID_PCM_S16LE: case CODEC_ID_PCM_S16BE:

1 0

Use av_get_bits_per_sample() for mBitsPerChannel in caf.
by git＠videolan.org 31 Jul '11

31 Jul '11

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Mon Aug 1 00:23:07 2011 +0200| [b35477a2f203a64fddd1a3fa96d8d6682839f788] | committer: Carl Eugen Hoyos Use av_get_bits_per_sample() for mBitsPerChannel in caf. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b35477a2f203a64fd… --- libavformat/cafenc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c index c324b8e..2d64bec 100644 --- a/libavformat/cafenc.c +++ b/libavformat/cafenc.c @@ -139,7 +139,7 @@ static int caf_write_header(AVFormatContext *s) avio_wb32(pb, enc->block_align); //< mBytesPerPacket avio_wb32(pb, samples_per_packet(enc->codec_id, enc->channels)); //< mFramesPerPacket avio_wb32(pb, enc->channels); //< mChannelsPerFrame - avio_wb32(pb, enc->bits_per_coded_sample); //< mBitsPerChannel + avio_wb32(pb, av_get_bits_per_sample(enc->codec_id)); //< mBitsPerChannel if (enc->channel_layout) { ffio_wfourcc(pb, "chan");

1 0