From 29470bb940d61faaf3b185af0ec512a29fc8d1bb Mon Sep 17 00:00:00 2001 From: Derek Buitenhuis Date: Wed, 30 May 2012 13:36:58 -0400 Subject: [PATCH 1/3] doxy: move av_guess_sample_aspect_ratio to correct place It should not be a part of the RIFF FourCCs group. Signed-off-by: Derek Buitenhuis --- libavformat/avformat.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 7dad8e27fe..3bbc68387d 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1948,6 +1948,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. @@ -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); -/** - * @} - */ - /** * @} */ From 7ff318e2dd31e8fd10b593111ee64aea11ceb9a4 Mon Sep 17 00:00:00 2001 From: Derek Buitenhuis Date: Thu, 12 Jul 2012 21:24:38 -0400 Subject: [PATCH 2/3] libfdk-aac: Port to ff_alloc_packet2 Signed-off-by: Derek Buitenhuis --- libavcodec/libfdk-aacenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index 32d91e94a8..576d1ff0f7 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -306,7 +306,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; } From 86dd5fbf1505a09afe8eaa66548e8876d5a9e817 Mon Sep 17 00:00:00 2001 From: Derek Buitenhuis Date: Fri, 13 Jul 2012 11:35:11 -0400 Subject: [PATCH 3/3] doc: Remove stray @item from git-howto Fixes warning: ** @item outside of table or list (l. 362) Signed-off-by: Derek Buitenhuis --- doc/git-howto.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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.