diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-15 05:40:12 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-15 05:40:19 +0400 |
| commit | ab46300078d6c047c975c43baa71a32ca707e312 (patch) | |
| tree | 7c19f2d74084f63bc80e72af6e5056266f05b4c3 | |
| parent | 39afcf1d7eba8f2f3d59c973aa57df714e679629 (diff) | |
| parent | 86dd5fbf1505a09afe8eaa66548e8876d5a9e817 (diff) | |
Merge remote-tracking branch 'dwbuiten/master'
* 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>
| -rw-r--r-- | doc/git-howto.texi | 2 | ||||
| -rw-r--r-- | libavcodec/libfdk-aacenc.c | 2 | ||||
| -rw-r--r-- | libavformat/avformat.h | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/doc/git-howto.texi b/doc/git-howto.texi index f9acad585a..cd30b4707b 100644 --- a/doc/git-howto.texi +++ b/doc/git-howto.texi @@ -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 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 -@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. Next let the code pass through a full run of our testsuite. diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index 80d2652eab..cb1baf37a8 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -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. */ - 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"); return ret; } diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 7dad8e27fe..3bbc68387d 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1949,6 +1949,10 @@ const struct AVCodecTag *avformat_get_riff_video_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 * frame aspect ratio. * @@ -1971,8 +1975,4 @@ AVRational av_guess_sample_aspect_ratio(AVFormatContext *format, AVStream *strea * @} */ -/** - * @} - */ - #endif /* AVFORMAT_AVFORMAT_H */ |