mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Replace more FFmpeg references by Libav.
This commit is contained in:
parent
4c64c8e95a
commit
6001dad6e2
@ -167,7 +167,7 @@ Set the first PID for data packets (default 0x0100, max 0x0f00).
|
|||||||
|
|
||||||
The recognized metadata settings in mpegts muxer are @code{service_provider}
|
The recognized metadata settings in mpegts muxer are @code{service_provider}
|
||||||
and @code{service_name}. If they are not set the default for
|
and @code{service_name}. If they are not set the default for
|
||||||
@code{service_provider} is "FFmpeg" and the default for
|
@code{service_provider} is "Libav" and the default for
|
||||||
@code{service_name} is "Service01".
|
@code{service_name} is "Service01".
|
||||||
|
|
||||||
@example
|
@example
|
||||||
|
@ -4061,7 +4061,7 @@ int ff_check_alignment(void){
|
|||||||
"Compiler did not align stack variables. Libavcodec has been miscompiled\n"
|
"Compiler did not align stack variables. Libavcodec has been miscompiled\n"
|
||||||
"and may be very slow or crash. This is not a bug in libavcodec,\n"
|
"and may be very slow or crash. This is not a bug in libavcodec,\n"
|
||||||
"but in the compiler. You may try recompiling using gcc >= 4.2.\n"
|
"but in the compiler. You may try recompiling using gcc >= 4.2.\n"
|
||||||
"Do not report crashes to FFmpeg developers.\n");
|
"Do not report crashes to Libav developers.\n");
|
||||||
#endif
|
#endif
|
||||||
did_fail=1;
|
did_fail=1;
|
||||||
}
|
}
|
||||||
|
@ -787,7 +787,7 @@ static av_always_inline int dv_init_enc_block(EncBlockInfo* bi, uint8_t *data, i
|
|||||||
method suggested in SMPTE 314M Table 22, and an improved
|
method suggested in SMPTE 314M Table 22, and an improved
|
||||||
method. The SMPTE method is very conservative; it assigns class
|
method. The SMPTE method is very conservative; it assigns class
|
||||||
3 (i.e. severe quantization) to any block where the largest AC
|
3 (i.e. severe quantization) to any block where the largest AC
|
||||||
component is greater than 36. FFmpeg's DV encoder tracks AC bit
|
component is greater than 36. Libav's DV encoder tracks AC bit
|
||||||
consumption precisely, so there is no need to bias most blocks
|
consumption precisely, so there is no need to bias most blocks
|
||||||
towards strongly lossy compression. Instead, we assign class 2
|
towards strongly lossy compression. Instead, we assign class 2
|
||||||
to most blocks, and use class 3 only when strictly necessary
|
to most blocks, and use class 3 only when strictly necessary
|
||||||
@ -795,7 +795,7 @@ static av_always_inline int dv_init_enc_block(EncBlockInfo* bi, uint8_t *data, i
|
|||||||
|
|
||||||
#if 0 /* SMPTE spec method */
|
#if 0 /* SMPTE spec method */
|
||||||
static const int classes[] = {12, 24, 36, 0xffff};
|
static const int classes[] = {12, 24, 36, 0xffff};
|
||||||
#else /* improved FFmpeg method */
|
#else /* improved Libav method */
|
||||||
static const int classes[] = {-1, -1, 255, 0xffff};
|
static const int classes[] = {-1, -1, 255, 0xffff};
|
||||||
#endif
|
#endif
|
||||||
int max = classes[0];
|
int max = classes[0];
|
||||||
|
@ -60,7 +60,7 @@ struct dxva_context {
|
|||||||
uint64_t workaround;
|
uint64_t workaround;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Private to the FFmpeg AVHWAccel implementation
|
* Private to the Libav AVHWAccel implementation
|
||||||
*/
|
*/
|
||||||
unsigned report_id;
|
unsigned report_id;
|
||||||
};
|
};
|
||||||
|
@ -95,7 +95,7 @@ static void fill_picture_parameters(struct dxva_context *ctx, const H264Context
|
|||||||
pp->wBitFields = ((s->picture_structure != PICT_FRAME) << 0) |
|
pp->wBitFields = ((s->picture_structure != PICT_FRAME) << 0) |
|
||||||
(h->sps.mb_aff << 1) |
|
(h->sps.mb_aff << 1) |
|
||||||
(h->sps.residual_color_transform_flag << 2) |
|
(h->sps.residual_color_transform_flag << 2) |
|
||||||
/* sp_for_switch_flag (not implemented by FFmpeg) */
|
/* sp_for_switch_flag (not implemented by Libav) */
|
||||||
(0 << 3) |
|
(0 << 3) |
|
||||||
(h->sps.chroma_format_idc << 4) |
|
(h->sps.chroma_format_idc << 4) |
|
||||||
((h->nal_ref_idc != 0) << 6) |
|
((h->nal_ref_idc != 0) << 6) |
|
||||||
@ -146,8 +146,8 @@ static void fill_picture_parameters(struct dxva_context *ctx, const H264Context
|
|||||||
pp->deblocking_filter_control_present_flag = h->pps.deblocking_filter_parameters_present;
|
pp->deblocking_filter_control_present_flag = h->pps.deblocking_filter_parameters_present;
|
||||||
pp->redundant_pic_cnt_present_flag= h->pps.redundant_pic_cnt_present;
|
pp->redundant_pic_cnt_present_flag= h->pps.redundant_pic_cnt_present;
|
||||||
pp->Reserved8BitsB = 0;
|
pp->Reserved8BitsB = 0;
|
||||||
pp->slice_group_change_rate_minus1= 0; /* XXX not implemented by FFmpeg */
|
pp->slice_group_change_rate_minus1= 0; /* XXX not implemented by Libav */
|
||||||
//pp->SliceGroupMap[810]; /* XXX not implemented by FFmpeg */
|
//pp->SliceGroupMap[810]; /* XXX not implemented by Libav */
|
||||||
}
|
}
|
||||||
|
|
||||||
static void fill_scaling_lists(const H264Context *h, DXVA_Qmatrix_H264 *qm)
|
static void fill_scaling_lists(const H264Context *h, DXVA_Qmatrix_H264 *qm)
|
||||||
@ -243,7 +243,7 @@ static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
slice->slice_qs_delta = 0; /* XXX not implemented by FFmpeg */
|
slice->slice_qs_delta = 0; /* XXX not implemented by Libav */
|
||||||
slice->slice_qp_delta = s->qscale - h->pps.init_qp;
|
slice->slice_qp_delta = s->qscale - h->pps.init_qp;
|
||||||
slice->redundant_pic_cnt = h->redundant_pic_count;
|
slice->redundant_pic_cnt = h->redundant_pic_count;
|
||||||
if (h->slice_type == FF_B_TYPE)
|
if (h->slice_type == FF_B_TYPE)
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
* (or test broken JPEG-LS decoder) and slow down ordinary decoding a bit.
|
* (or test broken JPEG-LS decoder) and slow down ordinary decoding a bit.
|
||||||
*
|
*
|
||||||
* There is no Golomb code with length >= 32 bits possible, so check and
|
* There is no Golomb code with length >= 32 bits possible, so check and
|
||||||
* avoid situation of 32 zeros, FFmpeg Golomb decoder is painfully slow
|
* avoid situation of 32 zeros, Libav Golomb decoder is painfully slow
|
||||||
* on this errors.
|
* on this errors.
|
||||||
*/
|
*/
|
||||||
//#define JLS_BROKEN
|
//#define JLS_BROKEN
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
#include <libdirac_common/dirac_types.h>
|
#include <libdirac_common/dirac_types.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Table providing a Dirac chroma format to FFmpeg pixel format mapping.
|
* Table providing a Dirac chroma format to Libav pixel format mapping.
|
||||||
*/
|
*/
|
||||||
static const struct {
|
static const struct {
|
||||||
enum PixelFormat ff_pix_fmt;
|
enum PixelFormat ff_pix_fmt;
|
||||||
|
@ -47,7 +47,7 @@ typedef struct FfmpegDiracDecoderParams {
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* returns FFmpeg chroma format
|
* returns Libav chroma format
|
||||||
*/
|
*/
|
||||||
static enum PixelFormat GetFfmpegChromaFormat(dirac_chroma_t dirac_pix_fmt)
|
static enum PixelFormat GetFfmpegChromaFormat(dirac_chroma_t dirac_pix_fmt)
|
||||||
{
|
{
|
||||||
@ -103,7 +103,7 @@ static int libdirac_decode_frame(AVCodecContext *avccontext,
|
|||||||
|
|
||||||
case STATE_SEQUENCE:
|
case STATE_SEQUENCE:
|
||||||
{
|
{
|
||||||
/* tell FFmpeg about sequence details */
|
/* tell Libav about sequence details */
|
||||||
dirac_sourceparams_t *src_params = &p_dirac_params->p_decoder->src_params;
|
dirac_sourceparams_t *src_params = &p_dirac_params->p_decoder->src_params;
|
||||||
|
|
||||||
if (av_image_check_size(src_params->width, src_params->height,
|
if (av_image_check_size(src_params->width, src_params->height,
|
||||||
|
@ -118,7 +118,7 @@ static SchroBuffer* FfmpegFindNextSchroParseUnit(FfmpegSchroParseUnitContext *pa
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns FFmpeg chroma format.
|
* Returns Libav chroma format.
|
||||||
*/
|
*/
|
||||||
static enum PixelFormat GetFfmpegChromaFormat(SchroChromaFormat schro_pix_fmt)
|
static enum PixelFormat GetFfmpegChromaFormat(SchroChromaFormat schro_pix_fmt)
|
||||||
{
|
{
|
||||||
@ -169,7 +169,7 @@ static void libschroedinger_handle_first_access_unit(AVCodecContext *avccontext)
|
|||||||
|
|
||||||
p_schro_params->format = schro_decoder_get_video_format(decoder);
|
p_schro_params->format = schro_decoder_get_video_format(decoder);
|
||||||
|
|
||||||
/* Tell FFmpeg about sequence details. */
|
/* Tell Libav about sequence details. */
|
||||||
if (av_image_check_size(p_schro_params->format->width, p_schro_params->format->height,
|
if (av_image_check_size(p_schro_params->format->width, p_schro_params->format->height,
|
||||||
0, avccontext) < 0) {
|
0, avccontext) < 0) {
|
||||||
av_log(avccontext, AV_LOG_ERROR, "invalid dimensions (%dx%d)\n",
|
av_log(avccontext, AV_LOG_ERROR, "invalid dimensions (%dx%d)\n",
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
* and o_ prefixes on variables which are libogg types.
|
* and o_ prefixes on variables which are libogg types.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* FFmpeg includes */
|
/* Libav includes */
|
||||||
#include "libavutil/intreadwrite.h"
|
#include "libavutil/intreadwrite.h"
|
||||||
#include "libavutil/log.h"
|
#include "libavutil/log.h"
|
||||||
#include "libavutil/base64.h"
|
#include "libavutil/base64.h"
|
||||||
|
@ -209,7 +209,7 @@ static int vlc_decode_block(MimicContext *ctx, int num_coeffs, int qscale)
|
|||||||
|
|
||||||
value = get_bits(&ctx->gb, num_bits);
|
value = get_bits(&ctx->gb, num_bits);
|
||||||
|
|
||||||
/* FFmpeg's IDCT behaves somewhat different from the original code, so
|
/* Libav's IDCT behaves somewhat different from the original code, so
|
||||||
* a factor of 4 was added to the input */
|
* a factor of 4 was added to the input */
|
||||||
|
|
||||||
coeff = vlcdec_lookup[num_bits][value];
|
coeff = vlcdec_lookup[num_bits][value];
|
||||||
|
@ -64,7 +64,7 @@ typedef struct TM2Context{
|
|||||||
* Huffman codes for each of streams
|
* Huffman codes for each of streams
|
||||||
*/
|
*/
|
||||||
typedef struct TM2Codes{
|
typedef struct TM2Codes{
|
||||||
VLC vlc; ///< table for FFmpeg bitstream reader
|
VLC vlc; ///< table for Libav bitstream reader
|
||||||
int bits;
|
int bits;
|
||||||
int *recode; ///< table for converting from code indexes to values
|
int *recode; ///< table for converting from code indexes to values
|
||||||
int length;
|
int length;
|
||||||
|
@ -1189,7 +1189,7 @@ int ff_match_2uint16(const uint16_t (*tab)[2], int size, int a, int b){
|
|||||||
|
|
||||||
void av_log_missing_feature(void *avc, const char *feature, int want_sample)
|
void av_log_missing_feature(void *avc, const char *feature, int want_sample)
|
||||||
{
|
{
|
||||||
av_log(avc, AV_LOG_WARNING, "%s not implemented. Update your FFmpeg "
|
av_log(avc, AV_LOG_WARNING, "%s not implemented. Update your Libav "
|
||||||
"version to the newest one from Git. If the problem still "
|
"version to the newest one from Git. If the problem still "
|
||||||
"occurs, it means that your file has a feature which has not "
|
"occurs, it means that your file has a feature which has not "
|
||||||
"been implemented.", feature);
|
"been implemented.", feature);
|
||||||
|
@ -258,7 +258,7 @@ static int start_frame(AVCodecContext *avctx,
|
|||||||
pic_param->seq_fields.bits.delta_pic_order_always_zero_flag = h->sps.delta_pic_order_always_zero_flag;
|
pic_param->seq_fields.bits.delta_pic_order_always_zero_flag = h->sps.delta_pic_order_always_zero_flag;
|
||||||
pic_param->num_slice_groups_minus1 = h->pps.slice_group_count - 1;
|
pic_param->num_slice_groups_minus1 = h->pps.slice_group_count - 1;
|
||||||
pic_param->slice_group_map_type = h->pps.mb_slice_group_map_type;
|
pic_param->slice_group_map_type = h->pps.mb_slice_group_map_type;
|
||||||
pic_param->slice_group_change_rate_minus1 = 0; /* XXX: unimplemented in FFmpeg */
|
pic_param->slice_group_change_rate_minus1 = 0; /* XXX: unimplemented in Libav */
|
||||||
pic_param->pic_init_qp_minus26 = h->pps.init_qp - 26;
|
pic_param->pic_init_qp_minus26 = h->pps.init_qp - 26;
|
||||||
pic_param->pic_init_qs_minus26 = h->pps.init_qs - 26;
|
pic_param->pic_init_qs_minus26 = h->pps.init_qs - 26;
|
||||||
pic_param->chroma_qp_index_offset = h->pps.chroma_qp_index_offset[0];
|
pic_param->chroma_qp_index_offset = h->pps.chroma_qp_index_offset[0];
|
||||||
|
@ -129,7 +129,7 @@ static int vaapi_mpeg4_decode_slice(AVCodecContext *avctx, const uint8_t *buffer
|
|||||||
|
|
||||||
/* video_plane_with_short_video_header() contains all GOBs
|
/* video_plane_with_short_video_header() contains all GOBs
|
||||||
* in-order, and this is what VA API (Intel backend) expects: only
|
* in-order, and this is what VA API (Intel backend) expects: only
|
||||||
* a single slice param. So fake macroblock_number for FFmpeg so
|
* a single slice param. So fake macroblock_number for Libav so
|
||||||
* that we don't call vaapi_mpeg4_decode_slice() again
|
* that we don't call vaapi_mpeg4_decode_slice() again
|
||||||
*/
|
*/
|
||||||
if (avctx->codec->id == CODEC_ID_H263)
|
if (avctx->codec->id == CODEC_ID_H263)
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
#include "vc1.h"
|
#include "vc1.h"
|
||||||
#include "vc1data.h"
|
#include "vc1data.h"
|
||||||
|
|
||||||
/** Translate FFmpeg MV modes to VA API */
|
/** Translate Libav MV modes to VA API */
|
||||||
static int get_VAMvModeVC1(enum MVModes mv_mode)
|
static int get_VAMvModeVC1(enum MVModes mv_mode)
|
||||||
{
|
{
|
||||||
switch (mv_mode) {
|
switch (mv_mode) {
|
||||||
@ -116,7 +116,7 @@ static inline VAMvModeVC1 vc1_get_MVMODE2(VC1Context *v)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Pack FFmpeg bitplanes into a VABitPlaneBuffer element */
|
/** Pack Libav bitplanes into a VABitPlaneBuffer element */
|
||||||
static inline void vc1_pack_bitplanes(uint8_t *bitplane, int n, const uint8_t *ff_bp[3], int x, int y, int stride)
|
static inline void vc1_pack_bitplanes(uint8_t *bitplane, int n, const uint8_t *ff_bp[3], int x, int y, int stride)
|
||||||
{
|
{
|
||||||
const int bitplane_index = n / 2;
|
const int bitplane_index = n / 2;
|
||||||
|
@ -1,19 +1,19 @@
|
|||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
* This file is part of FFmpeg.
|
* This file is part of Libav.
|
||||||
*
|
*
|
||||||
* FFmpeg is free software; you can redistribute it and/or
|
* Libav is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
* License as published by the Free Software Foundation; either
|
* License as published by the Free Software Foundation; either
|
||||||
* version 2.1 of the License, or (at your option) any later version.
|
* version 2.1 of the License, or (at your option) any later version.
|
||||||
*
|
*
|
||||||
* FFmpeg is distributed in the hope that it will be useful,
|
* Libav is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
* Lesser General Public License for more details.
|
* Lesser General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
* License along with FFmpeg; if not, write to the Free Software
|
* License along with Libav; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -957,7 +957,7 @@ static av_cold int vorbis_encode_init(AVCodecContext *avccontext)
|
|||||||
vorbis_enc_context *venc = avccontext->priv_data;
|
vorbis_enc_context *venc = avccontext->priv_data;
|
||||||
|
|
||||||
if (avccontext->channels != 2) {
|
if (avccontext->channels != 2) {
|
||||||
av_log(avccontext, AV_LOG_ERROR, "Current FFmpeg Vorbis encoder only supports 2 channels.\n");
|
av_log(avccontext, AV_LOG_ERROR, "Current Libav Vorbis encoder only supports 2 channels.\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1912,7 +1912,7 @@ static int wmavoice_decode_packet(AVCodecContext *ctx, void *data,
|
|||||||
*data_size = 0;
|
*data_size = 0;
|
||||||
|
|
||||||
/* Packets are sometimes a multiple of ctx->block_align, with a packet
|
/* Packets are sometimes a multiple of ctx->block_align, with a packet
|
||||||
* header at each ctx->block_align bytes. However, FFmpeg's ASF demuxer
|
* header at each ctx->block_align bytes. However, Libav's ASF demuxer
|
||||||
* feeds us ASF packets, which may concatenate multiple "codec" packets
|
* feeds us ASF packets, which may concatenate multiple "codec" packets
|
||||||
* in a single "muxer" packet, so we artificially emulate that by
|
* in a single "muxer" packet, so we artificially emulate that by
|
||||||
* capping the packet size at ctx->block_align. */
|
* capping the packet size at ctx->block_align. */
|
||||||
|
@ -2,20 +2,20 @@
|
|||||||
* Copyright (c) 2010 Brandon Mintern
|
* Copyright (c) 2010 Brandon Mintern
|
||||||
* Copyright (c) 2007 Bobby Bingham
|
* Copyright (c) 2007 Bobby Bingham
|
||||||
*
|
*
|
||||||
* This file is part of FFmpeg.
|
* This file is part of Libav.
|
||||||
*
|
*
|
||||||
* FFmpeg is free software; you can redistribute it and/or
|
* Libav is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
* License as published by the Free Software Foundation; either
|
* License as published by the Free Software Foundation; either
|
||||||
* version 2.1 of the License, or (at your option) any later version.
|
* version 2.1 of the License, or (at your option) any later version.
|
||||||
*
|
*
|
||||||
* FFmpeg is distributed in the hope that it will be useful,
|
* Libav is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
* Lesser General Public License for more details.
|
* Lesser General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
* License along with FFmpeg; if not, write to the Free Software
|
* License along with Libav; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -742,7 +742,7 @@ typedef struct AVFormatContext {
|
|||||||
/**
|
/**
|
||||||
* Decoding: total stream bitrate in bit/s, 0 if not
|
* Decoding: total stream bitrate in bit/s, 0 if not
|
||||||
* available. Never set it directly if the file_size and the
|
* available. Never set it directly if the file_size and the
|
||||||
* duration are known as FFmpeg can compute it automatically.
|
* duration are known as Libav can compute it automatically.
|
||||||
*/
|
*/
|
||||||
int bit_rate;
|
int bit_rate;
|
||||||
|
|
||||||
|
@ -588,7 +588,7 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
|
|||||||
|
|
||||||
/* Extract palette from extradata if bpp <= 8. */
|
/* Extract palette from extradata if bpp <= 8. */
|
||||||
/* This code assumes that extradata contains only palette. */
|
/* This code assumes that extradata contains only palette. */
|
||||||
/* This is true for all paletted codecs implemented in FFmpeg. */
|
/* This is true for all paletted codecs implemented in Libav. */
|
||||||
if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) {
|
if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) {
|
||||||
#if HAVE_BIGENDIAN
|
#if HAVE_BIGENDIAN
|
||||||
for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)/4; i++)
|
for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)/4; i++)
|
||||||
|
@ -181,7 +181,7 @@ static int mpegts_write_section1(MpegTSSection *s, int tid, int id,
|
|||||||
/*********************************************/
|
/*********************************************/
|
||||||
/* mpegts writer */
|
/* mpegts writer */
|
||||||
|
|
||||||
#define DEFAULT_PROVIDER_NAME "FFmpeg"
|
#define DEFAULT_PROVIDER_NAME "Libav"
|
||||||
#define DEFAULT_SERVICE_NAME "Service01"
|
#define DEFAULT_SERVICE_NAME "Service01"
|
||||||
|
|
||||||
/* a PES packet header is generated every DEFAULT_PES_HEADER_FREQ packets */
|
/* a PES packet header is generated every DEFAULT_PES_HEADER_FREQ packets */
|
||||||
|
@ -499,7 +499,7 @@ static void mxf_write_identification(AVFormatContext *s)
|
|||||||
{
|
{
|
||||||
MXFContext *mxf = s->priv_data;
|
MXFContext *mxf = s->priv_data;
|
||||||
AVIOContext *pb = s->pb;
|
AVIOContext *pb = s->pb;
|
||||||
const char *company = "FFmpeg";
|
const char *company = "Libav";
|
||||||
const char *product = "OP1a Muxer";
|
const char *product = "OP1a Muxer";
|
||||||
const char *version;
|
const char *version;
|
||||||
int length;
|
int length;
|
||||||
|
@ -59,7 +59,7 @@ static int speex_header(AVFormatContext *s, int idx) {
|
|||||||
st->codec->channels = AV_RL32(p + 48);
|
st->codec->channels = AV_RL32(p + 48);
|
||||||
|
|
||||||
/* We treat the whole Speex packet as a single frame everywhere Speex
|
/* We treat the whole Speex packet as a single frame everywhere Speex
|
||||||
is handled in FFmpeg. This avoids the complexities of splitting
|
is handled in Libav. This avoids the complexities of splitting
|
||||||
and joining individual Speex frames, which are not always
|
and joining individual Speex frames, which are not always
|
||||||
byte-aligned. */
|
byte-aligned. */
|
||||||
st->codec->frame_size = AV_RL32(p + 56);
|
st->codec->frame_size = AV_RL32(p + 56);
|
||||||
|
@ -28,7 +28,7 @@ int av_strerror(int errnum, char *errbuf, size_t errbuf_size)
|
|||||||
case AVERROR_EOF: errstr = "End of file"; break;
|
case AVERROR_EOF: errstr = "End of file"; break;
|
||||||
case AVERROR_INVALIDDATA: errstr = "Invalid data found when processing input"; break;
|
case AVERROR_INVALIDDATA: errstr = "Invalid data found when processing input"; break;
|
||||||
case AVERROR_NUMEXPECTED: errstr = "Number syntax expected in filename"; break;
|
case AVERROR_NUMEXPECTED: errstr = "Number syntax expected in filename"; break;
|
||||||
case AVERROR_PATCHWELCOME: errstr = "Not yet implemented in FFmpeg, patches welcome"; break;
|
case AVERROR_PATCHWELCOME: errstr = "Not yet implemented in Libav, patches welcome"; break;
|
||||||
case AVERROR_DEMUXER_NOT_FOUND: errstr = "Demuxer not found"; break;
|
case AVERROR_DEMUXER_NOT_FOUND: errstr = "Demuxer not found"; break;
|
||||||
case AVERROR_MUXER_NOT_FOUND: errstr = "Muxer not found"; break;
|
case AVERROR_MUXER_NOT_FOUND: errstr = "Muxer not found"; break;
|
||||||
case AVERROR_DECODER_NOT_FOUND: errstr = "Decoder not found"; break;
|
case AVERROR_DECODER_NOT_FOUND: errstr = "Decoder not found"; break;
|
||||||
|
@ -50,7 +50,7 @@
|
|||||||
|
|
||||||
#define AVERROR_EOF AVERROR(EPIPE) ///< End of file
|
#define AVERROR_EOF AVERROR(EPIPE) ///< End of file
|
||||||
|
|
||||||
#define AVERROR_PATCHWELCOME (-MKTAG('P','A','W','E')) ///< Not yet implemented in FFmpeg, patches welcome
|
#define AVERROR_PATCHWELCOME (-MKTAG('P','A','W','E')) ///< Not yet implemented in Libav, patches welcome
|
||||||
|
|
||||||
#if LIBAVUTIL_VERSION_MAJOR > 50
|
#if LIBAVUTIL_VERSION_MAJOR > 50
|
||||||
#define AVERROR_INVALIDDATA (-MKTAG('I','N','D','A')) ///< Invalid data found when processing input
|
#define AVERROR_INVALIDDATA (-MKTAG('I','N','D','A')) ///< Invalid data found when processing input
|
||||||
|
Loading…
Reference in New Issue
Block a user