Permalink
Browse files

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>
  • Loading branch information...
2 parents 39afcf1 + 86dd5fb commit ab46300078d6c047c975c43baa71a32ca707e312 @michaelni michaelni committed Jul 15, 2012
Showing with 6 additions and 6 deletions.
  1. +1 −1 doc/git-howto.texi
  2. +1 −1 libavcodec/libfdk-aacenc.c
  3. +4 −4 libavformat/avformat.h
View
2 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.
View
2 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;
}
View
8 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 */

0 comments on commit ab46300

Please sign in to comment.