virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

Fix "bistream" typo and add a check in tools/patcheck.

Browse Source
This commit is contained in:
Clément Bœsch 2012-12-18 02:46:42 +01:00
parent 1dd33d472a
commit 8b63744f48
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/ffmpeg.texi
View File

@ -914,7 +914,7 @@ ffmpeg -i infile -streamid 0:33 -streamid 1:36 out.ts
@end example @end example
@item -bsf[:@var{stream_specifier}] @var{bitstream_filters} (@emph{output,per-stream}) @item -bsf[:@var{stream_specifier}] @var{bitstream_filters} (@emph{output,per-stream})
Set bitstream filters for matching streams. @var{bistream_filters} is Set bitstream filters for matching streams. @var{bitstream_filters} is
a comma-separated list of bitstream filters. Use the @code{-bsfs} option a comma-separated list of bitstream filters. Use the @code{-bsfs} option
to get the list of bitstream filters. to get the list of bitstream filters.
@example @example

2
doc/libavcodec.texi
View File

@ -27,7 +27,7 @@ implementing robust and fast codecs as well as for experimentation.
@c man begin SEEALSO @c man begin SEEALSO
ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), ffmpeg-codecs(1), ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), ffmpeg-codecs(1),
ffmpeg-bistream-filters(1), libavutil(3) ffmpeg-bitstream-filters(1), libavutil(3)
@c man end @c man end
@c man begin AUTHORS @c man begin AUTHORS

2
libavcodec/h263dec.c
View File

@ -709,7 +709,7 @@ retry:
av_assert1(s->bitstream_buffer_size==0); av_assert1(s->bitstream_buffer_size==0);
frame_end: frame_end:
/* divx 5.01+ bistream reorder stuff */ /* divx 5.01+ bitstream reorder stuff */
if(s->codec_id==AV_CODEC_ID_MPEG4 && s->divx_packed){ if(s->codec_id==AV_CODEC_ID_MPEG4 && s->divx_packed){
int current_pos= s->gb.buffer == s->bitstream_buffer ? 0 : (get_bits_count(&s->gb)>>3); int current_pos= s->gb.buffer == s->bitstream_buffer ? 0 : (get_bits_count(&s->gb)>>3);
int startcode_found=0; int startcode_found=0;

2
libavcodec/rv34.c
View File

@ -215,7 +215,7 @@ static int rv34_decode_cbp(GetBitContext *gb, RV34VLC *vlc, int table)
} }
/** /**
* Get one coefficient value from the bistream and store it. * Get one coefficient value from the bitstream and store it.
*/ */
static inline void decode_coeff(DCTELEM *dst, int coef, int esc, GetBitContext *gb, VLC* vlc, int q) static inline void decode_coeff(DCTELEM *dst, int coef, int esc, GetBitContext *gb, VLC* vlc, int q)
{ {

2
libavcodec/vda_h264.c
View File

@ -285,7 +285,7 @@ int ff_vda_create_decoder(struct vda_context *vda_ctx,
pthread_mutex_init(&vda_ctx->queue_mutex, NULL); pthread_mutex_init(&vda_ctx->queue_mutex, NULL);
#endif #endif
/* Each VCL NAL in the bistream sent to the decoder /* Each VCL NAL in the bitstream sent to the decoder
* is preceded by a 4 bytes length header. * is preceded by a 4 bytes length header.
* Change the avcC atom header if needed, to signal headers of 4 bytes. */ * Change the avcC atom header if needed, to signal headers of 4 bytes. */
if (extradata_size >= 4 && (extradata[4] & 0x03) != 0x03) { if (extradata_size >= 4 && (extradata[4] & 0x03) != 0x03) {

2
libavformat/flvenc.c
View File

@ -494,7 +494,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
} else if (enc->codec_id == AV_CODEC_ID_AAC && pkt->size > 2 && } else if (enc->codec_id == AV_CODEC_ID_AAC && pkt->size > 2 &&
(AV_RB16(pkt->data) & 0xfff0) == 0xfff0) { (AV_RB16(pkt->data) & 0xfff0) == 0xfff0) {
av_log(s, AV_LOG_ERROR, "Malformed AAC bitstream detected: " av_log(s, AV_LOG_ERROR, "Malformed AAC bitstream detected: "
"use audio bistream filter 'aac_adtstoasc' to fix it " "use audio bitstream filter 'aac_adtstoasc' to fix it "
"('-bsf:a aac_adtstoasc' option with ffmpeg)\n"); "('-bsf:a aac_adtstoasc' option with ffmpeg)\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }

2
tools/patcheck
View File

@ -67,7 +67,7 @@ $EGREP $OPT '^\+ *(const *|)static' $*| $EGREP --color=always '[^=]= *(0|NULL)[^
cat $TMP cat $TMP
hiegrep '# *ifdef * (HAVE|CONFIG)_' 'ifdefs that should be #if' $* hiegrep '# *ifdef * (HAVE|CONFIG)_' 'ifdefs that should be #if' $*
hiegrep '\b(awnser|cant|dont|wont|usefull|successfull|occured|teh|alot|wether|skiped|skiping|heigth|informations|colums|loosy|loosing|ouput|seperate|preceed|upto|paket|posible|unkown|inpossible|dimention|acheive|funtions|overriden|outputing|seperation|initalize|compatibilty)\b' 'common typos' $* hiegrep '\b(awnser|cant|dont|wont|usefull|successfull|occured|teh|alot|wether|skiped|skiping|heigth|informations|colums|loosy|loosing|ouput|seperate|preceed|upto|paket|posible|unkown|inpossible|dimention|acheive|funtions|overriden|outputing|seperation|initalize|compatibilty|bistream)\b' 'common typos' $*
hiegrep 'av_log\( *NULL' 'Missing context in av_log' $* hiegrep 'av_log\( *NULL' 'Missing context in av_log' $*
hiegrep '[^sn]printf' 'Please use av_log' $* hiegrep '[^sn]printf' 'Please use av_log' $*