aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/aea.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-06-05 02:33:59 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-06-05 03:00:31 +0200
commit46eb300d016b69b5fedb0410df98e3c698090c8c (patch)
tree7aa230d9098654e1ce94bc32c2cfb8f1463e9e3b /libavformat/aea.c
parent124a9edb5f172ce36b11fd0d6ccc9f15cc51f322 (diff)
parent594fbe42c6b21aef76b938ce97524fa92a48e7a0 (diff)
downloadffmpeg-46eb300d016b69b5fedb0410df98e3c698090c8c.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: ARM: remove MULL inline asm mathops: use MUL64 macro where it forms part of other ops tty: factorise returning error codes. rawdec: add framerate private option. x11grab: add framerate private option. fbdev,v4l2: remove some forgotten uses of AVFormatParameters.time_base. bktr: don't error when AVFormatParameters.time_base isn't set. cmdutils: add missing const qualifier Skip headers not designed to work standalone during 'make checkheaders'. Add missing #includes to make headers self-contained. musepack: remove unnecessary #include from mpcdata.h musepack: remove extraneous mpcdata.h inclusions Fix error check in av_file_map() Conflicts: cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/aea.c')
0 files changed, 0 insertions, 0 deletions