← Back to branch summary

~ubuntu-branches/ubuntu/utopic/libav/utopic-proposed

« back to all changes in this revision

Viewing changes to libavcodec/x86/mpegvideo.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler, Reinhard Tartler, Rico Tzschichholz
  • Date: 2014-08-30 11:02:45 UTC
  • mfrom: (1.3.47 sid)
  • Revision ID: package-import@ubuntu.com-20140830110245-io3dg7q85wfr7125
Tags: 6:11~beta1-2
[ Reinhard Tartler ]
* Make libavcodec-dev depend on libavresample-dev

[ Rico Tzschichholz ]
* Some fixes and leftovers from soname bumps

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/x86/mpegvideo.c
25
25
#include "libavutil/x86/cpu.h"
26
26
#include "libavcodec/avcodec.h"
27
27
#include "libavcodec/mpegvideo.h"
28
 
#include "dsputil_x86.h"
29
28
 
30
29
#if HAVE_INLINE_ASM
31
30
 
445
444
 
446
445
#endif /* HAVE_INLINE_ASM */
447
446
 
448
 
av_cold void ff_MPV_common_init_x86(MpegEncContext *s)
 
447
av_cold void ff_mpv_common_init_x86(MpegEncContext *s)
449
448
{
450
449
#if HAVE_INLINE_ASM
451
450
    int cpu_flags = av_get_cpu_flags();