~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to stream/stream_ffmpeg.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:23:28 UTC
  • mfrom: (0.4.7 sid)
  • mto: This revision was merged to the branch mainline in revision 76.
  • Revision ID: package-import@ubuntu.com-20120112222328-8jqdyodym3p84ygu
Tags: 2:1.0~rc4.dfsg1+svn34540-1
* New upstream snapshot
* upload to unstable

Show diffs side-by-side

added added

removed removed

Lines of Context:
24
24
#include "stream.h"
25
25
#include "m_option.h"
26
26
#include "m_struct.h"
 
27
#include "av_helpers.h"
27
28
 
28
29
static int fill_buffer(stream_t *s, char *buffer, int max_len)
29
30
{
87
88
    int64_t size;
88
89
    int dummy;
89
90
 
90
 
    av_register_all();
 
91
    init_avformat();
91
92
    if (mode == STREAM_READ)
92
93
        flags = URL_RDONLY;
93
94
    else if (mode == STREAM_WRITE)