Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Jan 2013 12:22:45 +0000 (13:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Jan 2013 12:22:45 +0000 (13:22 +0100)
commit1894302a44f3babe736fabd78e168a70cb16ffac
tree5efdaf8f53c779e31e146a2b4aee9fc3442c07d8
parentdc8b36746a9d5101ef6ce146473c65a8827c51b1
parent7768a635c4ea15a9f3b2a602cc6aac3e629e7480
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cmdutils: update copyright year to 2013
  h264: check SPS entries directly to detect pixel format changes
  forgotten changelogs for 9_beta2

Conflicts:
Changelog
cmdutils.c
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavcodec/h264.c