← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavformat/wtv.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:
libavformat/wtv.c
25
25
 * @author Peter Ross <pross@xvid.org>
26
26
 */
27
27
 
 
28
#include <inttypes.h>
 
29
 
28
30
#include "libavutil/channel_layout.h"
29
31
#include "libavutil/intreadwrite.h"
30
32
#include "libavutil/intfloat.h"
37
39
 
38
40
/* Macros for formating GUIDs */
39
41
#define PRI_PRETTY_GUID \
40
 
    "%08x-%04x-%04x-%02x%02x%02x%02x%02x%02x%02x%02x"
 
42
    "%08"PRIx32"-%04"PRIx16"-%04"PRIx16"-%02x%02x%02x%02x%02x%02x%02x%02x"
41
43
#define ARG_PRETTY_GUID(g) \
42
44
    AV_RL32(g),AV_RL16(g+4),AV_RL16(g+6),g[8],g[9],g[10],g[11],g[12],g[13],g[14],g[15]
43
45
#define LEN_PRETTY_GUID 34
501
503
        return;
502
504
 
503
505
    if (type == 0 && length == 4) {
504
 
        snprintf(buf, buf_size, "%"PRIi32, avio_rl32(pb));
 
506
        snprintf(buf, buf_size, "%u", avio_rl32(pb));
505
507
    } else if (type == 1) {
506
508
        avio_get_str16le(pb, length, buf, buf_size);
507
509
        if (!strlen(buf)) {