← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libav/trusty-proposed

« back to all changes in this revision

Viewing changes to libavformat/matroskadec.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-10-23 18:49:26 UTC
  • mto: (1.1.18 experimental)
  • mto: This revision was merged to the branch mainline in revision 34.
  • Revision ID: package-import@ubuntu.com-20121023184926-cw5imrodltw6h5o4
Tags: upstream-9~beta2
Import upstream version 9~beta2

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/matroskadec.c
35
35
/* For ff_codec_get_id(). */
36
36
#include "riff.h"
37
37
#include "isom.h"
38
 
#include "rm.h"
 
38
#include "rmsipr.h"
39
39
#include "matroska.h"
40
40
#include "libavcodec/bytestream.h"
41
41
#include "libavcodec/mpeg4audio.h"