Merge commit 'ee8704916de79158da8a48a9ea5be819e83d23ba'

Browse Source

* commit 'ee8704916de79158da8a48a9ea5be819e83d23ba':
  mpegvideo: reindent

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer 2013-03-13 13:08:04 +01:00

parent f45fdb123f ee8704916d

commit df4517106a

1 changed files with 92 additions and 91 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files