← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavcodec/rv10enc.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2013-10-22 23:24:08 UTC
  • mfrom: (1.3.36 sid)
  • Revision ID: package-import@ubuntu.com-20131022232408-b8tvvn4pyzri9mi3
Tags: 6:9.10-1ubuntu1
https://launchpad.net/bugs/1243235
https://launchpad.net/bugs/1180288
https://launchpad.net/bugs/1242802
* Build all -extra flavors from this source package, as libav got demoted
  from main to universe, cf LP: #1243235
* Simplify debian/rules to follow exactly the code that debian executes
* New upstream (LP: #1180288) fixes lots of security issues (LP: #1242802)
* Merge from unstable, remaining changes:
  - build-depend on libtiff5-dev rather than libtiff4-dev,
    avoids FTBFS caused by imlib
  - follow the regular debian codepaths

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/rv10enc.c
28
28
#include "mpegvideo.h"
29
29
#include "put_bits.h"
30
30
 
31
 
void rv10_encode_picture_header(MpegEncContext *s, int picture_number)
 
31
void ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number)
32
32
{
33
33
    int full_frame= 0;
34
34
 
56
56
    put_bits(&s->pb, 3, 0);     /* ignored */
57
57
}
58
58
 
 
59
FF_MPV_GENERIC_CLASS(rv10)
 
60
 
59
61
AVCodec ff_rv10_encoder = {
60
62
    .name           = "rv10",
61
63
    .type           = AVMEDIA_TYPE_VIDEO,
62
 
    .id             = CODEC_ID_RV10,
 
64
    .id             = AV_CODEC_ID_RV10,
63
65
    .priv_data_size = sizeof(MpegEncContext),
64
 
    .init           = MPV_encode_init,
65
 
    .encode         = MPV_encode_picture,
66
 
    .close          = MPV_encode_end,
67
 
    .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
68
 
    .long_name= NULL_IF_CONFIG_SMALL("RealVideo 1.0"),
 
66
    .init           = ff_MPV_encode_init,
 
67
    .encode2        = ff_MPV_encode_picture,
 
68
    .close          = ff_MPV_encode_end,
 
69
    .pix_fmts       = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
 
70
    .long_name      = NULL_IF_CONFIG_SMALL("RealVideo 1.0"),
 
71
    .priv_class     = &rv10_class,
69
72
};