← Back to branch summary

~siretart/libav/merge.raring.libav-0.8.6

« back to all changes in this revision

Viewing changes to libavcodec/parser.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:30:00 UTC
  • mfrom: (1.4.1)
  • mto: (1.3.11 sid) (26.1.1 quantal-security)
  • mto: This revision was merged to the branch mainline in revision 15.
  • Revision ID: package-import@ubuntu.com-20120112223000-s1reiy1e28hnix42
Tags: upstream-0.8~beta2
Import upstream version 0.8~beta2

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/parser.c
216
216
/*****************************************************/
217
217
 
218
218
/**
219
 
 * combines the (truncated) bitstream to a complete frame
 
219
 * Combine the (truncated) bitstream to a complete frame.
220
220
 * @return -1 if no complete frame could be created, AVERROR(ENOMEM) if there was a memory allocation error
221
221
 */
222
222
int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_size)