Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Jun 2013 09:42:42 +0000 (11:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Jun 2013 09:42:42 +0000 (11:42 +0200)
commitf48366c7040ab2544a1d624f0a927a0b7780dd06
tree615c012103362599ee8deff39d597b8e7eb962cb
parenta620c8321efcf51e3d35462a5b7f088815faed14
parente21307a2b024938c6714f57c0524bdec72d607c7
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavf: don't abort if both encoder and muxer aspect ratios are not set

Conflicts:
libavformat/mux.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mux.c