generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'dwbuiten/master'

Browse Source 
* dwbuiten/master:
  doc: Remove stray @item from git-howto
  libfdk-aac: Port to ff_alloc_packet2
  doxy: move av_guess_sample_aspect_ratio to correct place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-07-15 03:40:12 +02:00
commit ab46300078
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/git-howto.texi
View File

@ -359,7 +359,7 @@ First, make sure that the commits and branches you are going to push
match what you want pushed and that nothing is missing, extraneous or match what you want pushed and that nothing is missing, extraneous or
wrong. You can see what will be pushed by running the git push command wrong. You can see what will be pushed by running the git push command
with --dry-run first. And then inspecting the commits listed with with --dry-run first. And then inspecting the commits listed with
@command{git log -p 1234567..987654}. The @item @command{git status} command @command{git log -p 1234567..987654}. The @command{git status} command
may help in finding local changes that have been forgotten to be added. may help in finding local changes that have been forgotten to be added.
Next let the code pass through a full run of our testsuite. Next let the code pass through a full run of our testsuite.

2
libavcodec/libfdk-aacenc.c
View File

@ -315,7 +315,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
} }
/* The maximum packet size is 6144 bits aka 768 bytes per channel. */ /* The maximum packet size is 6144 bits aka 768 bytes per channel. */
if ((ret = ff_alloc_packet(avpkt, FFMAX(8192, 768 * avctx->channels)))) { if ((ret = ff_alloc_packet2(avctx, avpkt, FFMAX(8192, 768 * avctx->channels)))) {
av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n"); av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n");
return ret; return ret;
} }

8
libavformat/avformat.h
View File

@ -1948,6 +1948,10 @@ const struct AVCodecTag *avformat_get_riff_video_tags(void);
*/ */
const struct AVCodecTag *avformat_get_riff_audio_tags(void); const struct AVCodecTag *avformat_get_riff_audio_tags(void);
/**
* @}
*/
/** /**
* Guesses the sample aspect ratio of a frame, based on both the stream and the * Guesses the sample aspect ratio of a frame, based on both the stream and the
* frame aspect ratio. * frame aspect ratio.
@ -1967,10 +1971,6 @@ const struct AVCodecTag *avformat_get_riff_audio_tags(void);
*/ */
AVRational av_guess_sample_aspect_ratio(AVFormatContext *format, AVStream *stream, AVFrame *frame); AVRational av_guess_sample_aspect_ratio(AVFormatContext *format, AVStream *stream, AVFrame *frame);
/**
* @}
*/
/** /**
* @} * @}
*/ */