← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavformat/metadata.h

  • 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:
libavformat/metadata.h
31
31
#include "avformat.h"
32
32
#include "libavutil/dict.h"
33
33
 
34
 
struct AVMetadataConv{
 
34
typedef struct AVMetadataConv {
35
35
    const char *native;
36
36
    const char *generic;
37
 
};
38
 
#if !FF_API_OLD_METADATA2
39
 
typedef struct AVMetadataConv AVMetadataConv;
40
 
#endif
 
37
} AVMetadataConv;
41
38
 
42
39
void ff_metadata_conv(AVDictionary **pm, const AVMetadataConv *d_conv,
43
40
                                       const AVMetadataConv *s_conv);